Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns
authorGrant Slater <openstreetmap@firefishy.com>
Tue, 17 Jan 2012 15:45:51 +0000 (15:45 +0000)
committerGrant Slater <openstreetmap@firefishy.com>
Tue, 17 Jan 2012 15:45:51 +0000 (15:45 +0000)
commit68891ca43bab909d0ef184fb8d3854d451da66b2
treec4307c6d88e02c3c0d6bd3ac9333f9b1bc0556b1
parent9d0eb6122d00782812ec7d4f0926007f5ac5c6ec
parent6b44698b0e7abf2ed534f59f6665957917195205
Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns