]> git.ipfire.org Git - thirdparty/dhcp.git/commit
Merge branch 'master' of repo.isc.org:/proj/git/prod/dhcp
authorJeremy C. Reed <jreed@isc.org>
Tue, 8 Mar 2016 17:11:28 +0000 (12:11 -0500)
committerJeremy C. Reed <jreed@isc.org>
Tue, 8 Mar 2016 17:11:28 +0000 (12:11 -0500)
commit26de50fb49bdab16eff5139421de2e0cc4076075
tree7213eb5bb3bb80fe2dd29e2f3a661e2032045eae
parent713a29568c4b90ec44676e0a0df0ab1322450183
parentb12e0ca96137430012205458866b0a8b388935a3
Merge branch 'master' of repo.isc.org:/proj/git/prod/dhcp

Conflicts:
RELNOTES
README
RELNOTES