[MERGE]: Merged with addons
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Thu, 15 May 2014 13:18:15 +0000 (18:48 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Thu, 15 May 2014 13:18:15 +0000 (18:48 +0530)
commit2a54564aef452b2c9131e83dcee088d5218a6291
tree98fdca933f412c2c40837721b4493ace9731eb9a
parent584fd2cbf748a4c27e0d8b2b936351ae75469884
parent721a3d4ed2fa1377bdbb5da642b290b8d8673761
[MERGE]: Merged with addons