BIND 10 trac1230, created. f60bf56ebed7189ad71d6c4ed4044d97b5e5c7a5 Merge branch 'trac1239' into trac1230

[BIND 10 source code commits]

The branch, trac1230 has been created
        at  f60bf56ebed7189ad71d6c4ed4044d97b5e5c7a5 (commit)

- Log -----------------------------------------------------------------
commit f60bf56ebed7189ad71d6c4ed4044d97b5e5c7a5
Merge: e945e57855e4252349635d4b1f90f11626da7508 3e3ba9302689de42e4e475f98436b096d112d371
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Tue Dec 20 17:14:30 2011 +0100

    Merge branch 'trac1239' into trac1230
    
    Conflicts:
    	ChangeLog
    	src/bin/dhcp4/dhcp4_srv.cc
    	src/bin/dhcp6/dhcp6_srv.cc
    	src/lib/dhcp/iface_mgr.cc
    	src/lib/dhcp/iface_mgr.h

commit e945e57855e4252349635d4b1f90f11626da7508
Merge: a47f01b6c860c565516456d329a4aebe63d346a0 e1252b9d0a5a8f23dad207911923326f05d0db4c
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Tue Dec 20 17:03:20 2011 +0100

    Merge branch 'trac1237' into trac1230

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