Merge branch '1.6'

Authored by hein.

Description

Merge branch '1.6'

Conflicts:
data/images/nickicons/default/index.desktop
data/images/nickicons/oxygen/index.desktop

Merged Changes

CommitAuthorDetailsCommitted
66804f3bb61chein
Fix margin under nicklist with empty quick button list. 
Apr 23 2015
5b1a680ba48dl10n daemon script
SVN_SILENT made messages (.desktop file) 
Apr 16 2015