[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 5 Jun 2013 08:59:40 +0000 (14:29 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 5 Jun 2013 08:59:40 +0000 (14:29 +0530)
bzr revid: tpa@tinyerp.com-20130605085940-jci6jc5kaowi3a0g


Trivial merge