[Merge] lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Thu, 25 Jul 2013 06:23:05 +0000 (11:53 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Thu, 25 Jul 2013 06:23:05 +0000 (11:53 +0530)
bzr revid: dbr@tinyerp.com-20130725062305-tdavv60h26ig42n6


Trivial merge