Merge branch 'Plasma/5.3'

Authored by davidedmundson.

Description

Merge branch 'Plasma/5.3'

Details

Merged Changes

CommitAuthorDetailsCommitted
2f31902a86a8davidedmundson
Edit the right user-dirs file 
Apr 17 2015
34a56f669cfbmart
size cotainment size after drop 
Apr 17 2015
d00072266dd7l10n daemon script
SVN_SILENT made messages (.desktop file) 
Apr 17 2015