BIND 10 trac3283, created. dbedf1862bc30ffd3e21140f2a6e72302d769b7a [master] Merge branch 'trac3322' (relay override in client classification)

[BIND 10 source code commits]

The branch, trac3283 has been created
        at  dbedf1862bc30ffd3e21140f2a6e72302d769b7a (commit)

- Log -----------------------------------------------------------------
commit dbedf1862bc30ffd3e21140f2a6e72302d769b7a
Merge: 431746f 5de565b
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Mon Feb 24 19:20:15 2014 +0100

    [master] Merge branch 'trac3322' (relay override in client classification)
    
    Conflicts:
    	ChangeLog
    	src/bin/dhcp6/tests/dhcp6_srv_unittest.cc

commit 431746f950a40196267838a1a75e8af9fe9a66fc
Author: Thomas Markwalder <tmark at isc.org>
Date:   Mon Feb 24 06:40:21 2014 -0500

    [master] Added ChangeLog entry 758 for #3340.

commit 985d66cba7665a71e17ef70c5d22c767abaad1b6
Merge: 78f1d79 5d8fd66
Author: Thomas Markwalder <tmark at isc.org>
Date:   Mon Feb 24 06:27:19 2014 -0500

    [master] Merge branch 'trac3340'
    
    Corrects DHO_HOST_OPTION bug in b10-dhcp4.

commit 78f1d79b95b86d528a25827cf017c9f0186d18b9
Merge: 4d63c8c 4f3ed6a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Feb 24 15:27:02 2014 +0530

    Merge branch 'trac3344'

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