]> git.ipfire.org Git - thirdparty/kea.git/commit
[2158] Merge branch 'trac2136' of ssh://git.bind10.isc.org/var/bind10/git/bind10...
authorNaoki Kambe <kambe@jprs.co.jp>
Mon, 20 Aug 2012 05:58:39 +0000 (14:58 +0900)
committerNaoki Kambe <kambe@jprs.co.jp>
Mon, 20 Aug 2012 05:58:39 +0000 (14:58 +0900)
commit8647cc12916a3be22650d5558e714a59bfdb0bcd
tree383651be103386292da7988b34cee2dd5824fca6
parent802589cc9ba0d647b7cb80b84f951f7f3cc6615a
parent945773f7b5ca39a700c15ef47238fe1d7435a94a
[2158] Merge branch 'trac2136' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2158

Conflicts:
tests/system/bindctl/nsx1/b10-config.db.template.in
configure.ac
doc/guide/bind10-guide.html
doc/guide/bind10-guide.txt
doc/guide/bind10-guide.xml
src/bin/bind10/bind10.8
src/bin/bind10/bind10.xml
src/bin/bind10/bind10_src.py.in
src/bin/bind10/tests/bind10_test.py.in
tests/system/bindctl/nsx1/b10-config.db.template.in
tests/system/bindctl/tests.sh