Merge branch 'master' of ssh://git.shadowcat.co.uk/Catalyst-Controller-MovableType
Oskari Okko Ojala [Wed, 18 Jan 2012 08:47:28 +0000 (10:47 +0200)]

Trivial merge