[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 30 Oct 2013 05:50:36 +0000 (11:20 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 30 Oct 2013 05:50:36 +0000 (11:20 +0530)
bzr revid: tpa@tinyerp.com-20131030055036-baqkp9n3luxponhq


Trivial merge