Merge branch 'master' of git.shadowcat.co.uk:CatalystX-HelpText
Cinxgler Mariaca Minda [Wed, 2 Nov 2011 16:14:43 +0000 (16:14 +0000)]

Trivial merge