Merge branch 'master' of git.shadowcat.co.uk:XML-Feed
Dave Cross [Mon, 12 Mar 2012 19:46:43 +0000 (19:46 +0000)]

Trivial merge