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)
commit98b1ead1d7c6c50e938e2d70dd7bbb98d2465a04
tree6257d11e9c9bea1455cd8035f738e47cb508962a
parentf57d5f9cf3d7547dcbe6202c88f9258b273bb28d
parentec89ae93cd404cdff50aaa53c019ffb108eabf4f
Merge https://github.com/openstreetmap/potlatch2