Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Fri, 3 Aug 2012 08:48:03 +0000 (09:48 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Fri, 3 Aug 2012 08:48:03 +0000 (09:48 +0100)

Trivial merge