[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 22 Nov 2013 08:54:02 +0000 (14:24 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 22 Nov 2013 08:54:02 +0000 (14:24 +0530)
bzr revid: tpa@tinyerp.com-20131122085402-6i6k05cew1z47kxr


Trivial merge