Merge pull request #4796 from BlackIkeEagle/Gotham-non-exec-desktop
authorjmarshallnz <jcmarsha@gmail.com>
Sat, 7 Jun 2014 05:30:59 +0000 (17:30 +1200)
committerjmarshallnz <jcmarsha@gmail.com>
Sat, 7 Jun 2014 05:30:59 +0000 (17:30 +1200)
Gotham non exec desktop


Trivial merge