[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Wed, 25 Jan 2012 11:49:11 +0000 (17:19 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Wed, 25 Jan 2012 11:49:11 +0000 (17:19 +0530)
commit1deaf29aec96d48d74dd5f0b5463a9607f1ab330
treea2f8098481908340681c180db940bf25b80ff014
parent3399221f6230a8f724943c33ad0b2ab2ff0d46e7
parent1f8536a33459d732a9ad372f0da78d0606bbc053
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20120125114911-qqcm2v4uhgf2jcim