Merge branch 'master' of https://github.com/gravitystorm/Potlatch2
authorGrant Slater <gitorious@firefishy.com>
Sun, 3 Apr 2011 13:11:46 +0000 (14:11 +0100)
committerGrant Slater <gitorious@firefishy.com>
Sun, 3 Apr 2011 13:11:46 +0000 (14:11 +0100)

Trivial merge