[MERGE] Merge with lp:openobject-addons
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Tue, 12 Jun 2012 06:05:00 +0000 (11:35 +0530)
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Tue, 12 Jun 2012 06:05:00 +0000 (11:35 +0530)
commit6e43e8f9e248a34af4a8244c2c6ecb858cbd75e2
tree5d5c46132b4e836d81fa0f47e25ba8d302d53141
parentc95b6d26abc54d3d597cb577410033afba971363
parentb8716390702b098c395fd452b9152481157c8b6d
[MERGE] Merge with lp:openobject-addons

bzr revid: kjo@tinyerp.com-20120612060500-kh1rj7qy2whj34yu