Merge branch 'master' of https://github.com/systemed/potlatch2 into drawquad
authorRichard Fairhurst <richard@systemeD.net>
Tue, 5 Apr 2011 14:18:31 +0000 (15:18 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Tue, 5 Apr 2011 14:18:31 +0000 (15:18 +0100)

Trivial merge