Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Fri, 28 Sep 2012 14:45:51 +0000 (15:45 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Fri, 28 Sep 2012 14:45:51 +0000 (15:45 +0100)

Trivial merge