Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Sat, 30 Jun 2012 14:24:15 +0000 (15:24 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sat, 30 Jun 2012 14:24:15 +0000 (15:24 +0100)

Trivial merge