Merge branch 'bug/addcustomlaunchdesktopparams' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 27 Feb 2015 17:01:25 +0000 (17:01 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 27 Feb 2015 17:01:25 +0000 (17:01 +0000)

Trivial merge