Merge branch '5.1'

Authored by kossebau on Apr 1 2017, 8:17 PM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. app/main.cpp

Merged Changes

CommitAuthorDetailsCommitted
849f2d771720kossebau
Fix About data desktopFileName: should be given without file extension 
Apr 1 2017
d4c000fb420cl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Mar 28 2017