Merge branch '1.6'

Authored by argonel.

Description

Merge branch '1.6'

Details

Committed
argonelApr 27 2015, 1:33 AM
Parents
R7:8bbeb0ad2295: Revert nicknameCombobox changes
R7:999ff77bd33a: Merge branch '1.6'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
8bbeb0ad2295argonel
Revert nicknameCombobox changes 
Apr 27 2015