[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 28 Oct 2013 07:14:45 +0000 (12:44 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 28 Oct 2013 07:14:45 +0000 (12:44 +0530)
bzr revid: tpa@tinyerp.com-20131028071445-aa1gbnuaj485ue5i


Trivial merge