]> git.ipfire.org Git - thirdparty/dhcp.git/commitdiff
[master] Merge version stamps with disalbing max alloc test
authorShawn Routhier <sar@isc.org>
Fri, 26 Aug 2016 17:54:17 +0000 (10:54 -0700)
committerShawn Routhier <sar@isc.org>
Fri, 26 Aug 2016 17:54:17 +0000 (10:54 -0700)
Merge branch 'master' of repo.isc.org:/proj/git/prod/dhcp


Trivial merge