[FIX]paste dict_merge2 instead of import
authordle@openerp.com <>
Wed, 19 Dec 2012 17:18:35 +0000 (18:18 +0100)
committerdle@openerp.com <>
Wed, 19 Dec 2012 17:18:35 +0000 (18:18 +0100)
commitf2e50cc6a739eccf1986bdcde53bbd29f36ac253
tree0c0694ba0235b301ea1a40f0d1d98e033af17054
parenteabc5b0dde75d176e7abae4be40b68479d9ba294
[FIX]paste dict_merge2 instead of import

bzr revid: dle@openerp.com-20121219171835-p6jsfd3zgq5t41ug
addons/document_webdav/dav_fs.py