[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 11:34:50 +0000 (17:04 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 11:34:50 +0000 (17:04 +0530)
commit88a50de66f0594bec1e2b43748711ba5429074d1
treef080c2174dfb287fa5bb253cb2e57334f4f96cb3
parent331760830f64b9702f0f12edf1c997f646000a07
parentfbf6708d1041f84018bb9c13e997b705e6086648
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20110915113450-vjno3ec596s0go39