[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 30 Aug 2011 07:09:25 +0000 (12:39 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 30 Aug 2011 07:09:25 +0000 (12:39 +0530)
commit4d21e39e6f8b592cf414311ba2de350affded73e
tree3ee4aad50ada02c0507ee009dfcebbe80847d187
parent4a0cbe4b4f5827f186b794d4b1102eb81f0460e7
parentf0597f3686f8908c10759e75f607760ed664c4a3
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20110830070925-e490gfpl06sev28z