Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns
authorGrant Slater <openstreetmap@firefishy.com>
Sat, 31 Dec 2011 00:07:49 +0000 (00:07 +0000)
committerGrant Slater <openstreetmap@firefishy.com>
Sat, 31 Dec 2011 00:07:49 +0000 (00:07 +0000)
commit9d0eb6122d00782812ec7d4f0926007f5ac5c6ec
tree75ccb891449d019be649be16ede37314d0c06b61
parent95be9173dd5179ef6d5493660691338a0393eed8
parentf2277819c39840ad23d57d14d46a61c9ca7d7415
Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns