BIND 10 trac2874, created. 15471a94d7cd89204b1a7de89398255662590458 [master] Merge branch 'trac3048'

[BIND 10 source code commits]

The branch, trac2874 has been created
        at  15471a94d7cd89204b1a7de89398255662590458 (commit)

- Log -----------------------------------------------------------------
commit 15471a94d7cd89204b1a7de89398255662590458
Merge: 5639364 ca92335
Author: Stephen Morris <stephen at isc.org>
Date:   Tue Jul 16 11:57:31 2013 +0100

    [master] Merge branch 'trac3048'
    
    Conflicts:
    	src/lib/hooks/server_hooks.cc

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