Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Thu, 29 Sep 2011 08:41:09 +0000 (09:41 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Thu, 29 Sep 2011 08:41:09 +0000 (09:41 +0100)

Trivial merge