[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 30 Jul 2013 11:34:23 +0000 (17:04 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 30 Jul 2013 11:34:23 +0000 (17:04 +0530)
bzr revid: tpa@tinyerp.com-20130730113423-2try697gn838swrr


Trivial merge