[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 22 May 2013 06:30:35 +0000 (12:00 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 22 May 2013 06:30:35 +0000 (12:00 +0530)
bzr revid: tpa@tinyerp.com-20130522063035-nype13o1f6oneq4h


Trivial merge