BIND 10 pd-ietf-demo2, created. 1990382bc3ddab6db6d69baa9650e216d908e27d Merge branch 'trac3207' into pd-ietf-demo2

[BIND 10 source code commits]

The branch, pd-ietf-demo2 has been created
        at  1990382bc3ddab6db6d69baa9650e216d908e27d (commit)

- Log -----------------------------------------------------------------
commit 1990382bc3ddab6db6d69baa9650e216d908e27d
Merge: 23a9aaa 66748b4
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Oct 25 13:02:15 2013 +0200

    Merge branch 'trac3207' into pd-ietf-demo2

commit 23a9aaa0981187c6b0f229e7e5b0ae7bcf4ff11d
Merge: 959dfa6 c5e286f
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Oct 25 12:43:15 2013 +0200

    Merge branch 'trac3203' into pd-ietf-demo2
    
    Conflicts:
    	src/bin/dhcp4/dhcp4_srv.cc
    	src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
    	src/bin/dhcp4/tests/dhcp4_test_utils.h
    	src/lib/dhcp/dhcp4.h

commit 959dfa69405d9ae1dc52f0f447ccf8fcd6cf91fc
Merge: 97bf4f8 4a08e36
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Oct 25 12:40:22 2013 +0200

    Merge branch 'trac3210' into pd-ietf-demo2
    
    Conflicts:
    	doc/guide/bind10-guide.xml

commit 97bf4f86fef662ae1a59dc9dc264f28b19603b91
Merge: 2dbe0c8 d130cf2
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Oct 25 12:38:51 2013 +0200

    Merge remote-tracking branch 'origin/trac3207' into pd-ietf-demo2

-----------------------------------------------------------------------