]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e670f65 ff46195)
[master] Merge branch 'trac3373'
authorThomas Markwalder <tmark@isc.org>
Tue, 11 Mar 2014 12:10:01 +0000 (08:10 -0400)
committerThomas Markwalder <tmark@isc.org>
Tue, 11 Mar 2014 12:10:01 +0000 (08:10 -0400)
Python data.merge function now does "deep" merges


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