]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffddc0b df704dc)
[master] Re-merge changes for 3802
authorThomas Markwalder <tmark@isc.org>
Thu, 11 Jun 2015 10:19:21 +0000 (06:19 -0400)
committerThomas Markwalder <tmark@isc.org>
Thu, 11 Jun 2015 10:19:21 +0000 (06:19 -0400)
Additonal commits were made to master, while I was merging in 3802.


Trivial merge
Mirror of https://github.com/isc-projects/kea.git