Merge branch 'master' into sebas/configmodule

Authored by sebas on Oct 17 2016, 12:19 AM.

Description

Merge branch 'master' into sebas/configmodule

Merged Changes

CommitAuthorDetailsCommitted
e886c69e9a9bsebas
Disable unify button when only one output is connected 
Oct 16 2016
3a2d6b0a1918l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Oct 14 2016
a239809cb33fl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Oct 5 2016
a5f30ead8c6bl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Sep 28 2016