Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 18:40:43 +0000 (19:40 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 18:40:43 +0000 (19:40 +0100)

Trivial merge