[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 30 Aug 2011 07:12:01 +0000 (12:42 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 30 Aug 2011 07:12:01 +0000 (12:42 +0530)
commit6e7871c796a252171c4cff24a51c7a6e3b4bfcae
treec5cc498892787b279e6e2d15e8c52822f7559d02
parentac32088ba1c9ce9f28f412fd4b72cbc10cc4581a
parentf0597f3686f8908c10759e75f607760ed664c4a3
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20110830071201-2hfr16n8xlvtsmyl