From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 11 Mar 2014 12:10:01 +0000 (-0400)
Subject: [master] Merge branch 'trac3373'
X-Git-Tag: kea-eng-20140313~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da3b0d4f364d069ffdb47723545798ac589fae42;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3373'

Python data.merge function now does "deep" merges
---

da3b0d4f364d069ffdb47723545798ac589fae42