Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Tue, 2 Oct 2012 21:59:27 +0000 (22:59 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Tue, 2 Oct 2012 21:59:27 +0000 (22:59 +0100)

Trivial merge