]> git.ipfire.org Git - thirdparty/kea.git/commit
Merge branch 'trac3088' (adds d2::NameRemoveTransaction)
authorThomas Markwalder <tmark@isc.org>
Tue, 17 Dec 2013 16:50:33 +0000 (11:50 -0500)
committerThomas Markwalder <tmark@isc.org>
Tue, 17 Dec 2013 16:50:33 +0000 (11:50 -0500)
commitca58ac00fce4cb5f46e534d7ffadb2db4e4ffaf3
tree595141cfaec8f829d9db3c61f29e7bcde5de9e6a
parent0e2851da1d2f91263c2f474fecdfe14427cf5c34
parent13d812dc84b6967638efe30dd1dd1a34efcbfa80
Merge branch 'trac3088' (adds d2::NameRemoveTransaction)

Conflicts:
src/bin/d2/d2_messages.mes
src/bin/d2/d2_messages.mes