Merge https://github.com/systemed/potlatch2
authorGrant Slater <openstreetmap@firefishy.com>
Wed, 5 Oct 2011 16:39:01 +0000 (17:39 +0100)
committerGrant Slater <openstreetmap@firefishy.com>
Wed, 5 Oct 2011 16:39:01 +0000 (17:39 +0100)

Trivial merge