[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 11 Nov 2013 12:10:29 +0000 (17:40 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 11 Nov 2013 12:10:29 +0000 (17:40 +0530)
bzr revid: tpa@tinyerp.com-20131111121029-yewf1b0b6bxu4gyh


Trivial merge