Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/bind9-cn into... etch lenny
authorDinko Korunic <kreator@carnet.hr>
Sat, 9 May 2009 11:11:55 +0000 (13:11 +0200)
committerDinko Korunic <kreator@carnet.hr>
Sat, 9 May 2009 11:11:55 +0000 (13:11 +0200)
commitbab437142b6b7b51fa69bc90ab8b8b9cd1f04133
treee8ea7e41c558fc6942a21c718fe349819685023b
parent0434379a500c36370c63a05773ce864a3bcad783
parentc2f410567d3dd06ff0a562dbfe40750cdf7c4a22
Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/bind9-cn into etch
- resolve master/etch conflikte..
Conflicts:

debian/changelog
debian/control
debian/control