BIND 10 trac2355, created. 06602f5a998ac727aadd8e094e633c569487ac8f [master] Merge branch 'trac2634'

[BIND 10 source code commits]

The branch, trac2355 has been created
        at  06602f5a998ac727aadd8e094e633c569487ac8f (commit)

- Log -----------------------------------------------------------------
commit 06602f5a998ac727aadd8e094e633c569487ac8f
Merge: 1eb1178 3f3bc96
Author: Thomas Markwalder <tmark at isc.org>
Date:   Fri Apr 5 13:08:51 2013 -0400

    [master] Merge branch 'trac2634'

commit 1eb1178479503a5daf0f0ba43bf729d64c6ecd7c
Merge: d538f9e 29c3f7f
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Thu Apr 4 17:56:08 2013 +0200

    [master] Merge branch 'trac2827' (relay support in dhcp/Pkt6)
    
    Conflicts:
    	ChangeLog

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