From: Stephane Wirtel Date: Tue, 24 Jul 2012 11:39:43 +0000 (+0200) Subject: [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2_settings-cha X-Git-Tag: 7.0-server~2820^2~6 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=ed7aaae686631804a7eb5ef4e71b741121de5caa;hp=-c;p=odoo%2Fodoo.git [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2_settings-cha bzr revid: stw@openerp.com-20120724113943-ywl6qk4vkckcwgjr --- ed7aaae686631804a7eb5ef4e71b741121de5caa