]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1ea7ec 88f5ae0)
[master] Merge branch 'trac3374'
authorThomas Markwalder <tmark@isc.org>
Thu, 13 Mar 2014 15:22:54 +0000 (11:22 -0400)
committerThomas Markwalder <tmark@isc.org>
Thu, 13 Mar 2014 15:22:54 +0000 (11:22 -0400)
Merges in reversion of 3339 and 3373.


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