[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 15 Nov 2013 07:22:36 +0000 (12:52 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 15 Nov 2013 07:22:36 +0000 (12:52 +0530)
bzr revid: tpa@tinyerp.com-20131115072236-oqmd6bpe2oetvldy


Trivial merge