Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Fri, 8 Apr 2011 14:42:17 +0000 (15:42 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Fri, 8 Apr 2011 14:42:17 +0000 (15:42 +0100)

Trivial merge