Merge branch 'master' of git.shadowcat.co.uk:CatalystX-HelpText
Cinxgler Mariaca Minda [Mon, 3 Oct 2011 16:33:36 +0000 (17:33 +0100)]

Trivial merge