Merge branch 'master' of github.com:systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Tue, 9 Oct 2012 12:26:15 +0000 (13:26 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Tue, 9 Oct 2012 12:26:15 +0000 (13:26 +0100)

Trivial merge