Merge lp:openobject-addons
authorJigar Amin - OpenERP <jam@tinyerp.com>
Fri, 31 Aug 2012 06:09:41 +0000 (11:39 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Fri, 31 Aug 2012 06:09:41 +0000 (11:39 +0530)
bzr revid: jam@tinyerp.com-20120831060941-3usjwoe5nr0kg1ov


Trivial merge