[MERGE] lp:~openerp-dev/openobject-addons/trunk-openchatter
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Wed, 16 May 2012 04:57:58 +0000 (10:27 +0530)
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Wed, 16 May 2012 04:57:58 +0000 (10:27 +0530)
bzr revid: kjo@tinyerp.com-20120516045758-qj9lhax2i8yn9kbi


Trivial merge