Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Wed, 1 Aug 2012 16:01:45 +0000 (17:01 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Wed, 1 Aug 2012 16:01:45 +0000 (17:01 +0100)

Trivial merge