]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac2148'
authorJelte Jansen <jelte@isc.org>
Mon, 30 Jul 2012 09:03:09 +0000 (11:03 +0200)
committerJelte Jansen <jelte@isc.org>
Mon, 30 Jul 2012 09:03:09 +0000 (11:03 +0200)
Conflicts:
src/lib/dns/labelsequence.h

1  2 
src/lib/datasrc/memory_datasrc.cc
src/lib/dns/labelsequence.cc

Simple merge
Simple merge