Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Fri, 30 Sep 2011 22:34:14 +0000 (23:34 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Fri, 30 Sep 2011 22:34:14 +0000 (23:34 +0100)

Trivial merge