Fix bad merge of 5.9 into master

Authored by davidedmundson on Feb 14 2017, 10:36 AM.

Description

Fix bad merge of 5.9 into master

No idea how, but 19e83b28161783d570bde2ced692a8b5f2236693 got reverted
when someone merged 5.9 into master.

This solves that through classic copy and paste.

Details

Committed
davidedmundsonFeb 14 2017, 10:36 AM
Parents
R123:09b698346cf2: SVN_SILENT made messages (.desktop file) - always resolve ours
Branches
Unknown
Tags
Unknown