]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Merge branch 'v9_10' of /proj/git/prod/bind9 into v9_10
authorTinderbox User <tbox@isc.org>
Wed, 21 Jan 2015 23:45:31 +0000 (23:45 +0000)
committerTinderbox User <tbox@isc.org>
Wed, 21 Jan 2015 23:45:31 +0000 (23:45 +0000)
1  2 
lib/bind9/check.c
lib/dns/rbtdb.c
lib/isc/ratelimiter.c

Simple merge
diff --cc lib/dns/rbtdb.c
Simple merge
Simple merge