Merge https://github.com/openstreetmap/potlatch2
authorGrant Slater <grant@wwood.co.uk>
Tue, 20 Sep 2011 14:48:33 +0000 (14:48 +0000)
committerGrant Slater <grant@wwood.co.uk>
Tue, 20 Sep 2011 14:48:33 +0000 (14:48 +0000)

Trivial merge