[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)
commit69983af487501e38f16f0b67003814554894f0fc
tree89564aae6093c77994d38c6d6a61148388f177f0
parent9c6f104d862a06ee7a870118d30974a98dee2631
parente51ed975f35f76bb3396fdd2db0f809dc1014a4f
[MERGE] lp:~openerp-dev/openobject-addons/trunk-openchatter

bzr revid: kjo@tinyerp.com-20120516045758-qj9lhax2i8yn9kbi