From: Dinko Korunic <kreator@carnet.hr>
Date: Sat, 9 May 2009 11:11:55 +0000 (+0200)
Subject: Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/bind9-cn into... 
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=refs%2Fheads%2Flenny;p=bind9-cn.git

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
---

bab437142b6b7b51fa69bc90ab8b8b9cd1f04133