From: dl-taktik <dl@taktik.be>
Date: Wed, 22 May 2013 07:57:26 +0000 (+0200)
Subject: Merge.
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b0d479318f246a5cee8899c3943e372a53c4cdbb;p=odoo%2Fodoo.git

Merge.

bzr revid: dl@taktik.be-20130522075726-hj5gnvp27381jvlm
---

b0d479318f246a5cee8899c3943e372a53c4cdbb