[MRG] merege with lp:~openerp-dev/openobject-addons/trunk-openchatter
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 16 May 2012 04:54:08 +0000 (10:24 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 16 May 2012 04:54:08 +0000 (10:24 +0530)
commita9c0596063a708d70c92aae8460181786e706995
tree89564aae6093c77994d38c6d6a61148388f177f0
parent9c6f104d862a06ee7a870118d30974a98dee2631
parente51ed975f35f76bb3396fdd2db0f809dc1014a4f
[MRG] merege with lp:~openerp-dev/openobject-addons/trunk-openchatter

bzr revid: tpa@tinyerp.com-20120516045408-jic93czbxby6ijr5