[MRG]:merge lp:openobject-addons
authorSunil Sharma (OpenERP) <sunilsharma.sharma07@gmail.com>
Thu, 30 Jan 2014 04:49:53 +0000 (10:19 +0530)
committerSunil Sharma (OpenERP) <sunilsharma.sharma07@gmail.com>
Thu, 30 Jan 2014 04:49:53 +0000 (10:19 +0530)
bzr revid: sunilsharma.sharma07@gmail.com-20140130044953-qfg8wbm6835hi9dz


Trivial merge