[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:28:02 +0000 (17:58 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:28:02 +0000 (17:58 +0530)
commitc46efbdf104b7c639fc9f0eb1d40dca0fb8a13a4
tree833f4b5eb2df4d2de96aac8222e21480da9c41a3
parent965b3320826d05e807ed490817baa6012678065b
parentfbf6708d1041f84018bb9c13e997b705e6086648
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20110915122802-hkryrz918we4ynzj