[MERGE] form trunk-openchatter-vive-lilo-chm; Improve openchatter and fix
authorChristophe Matthieu <chm@openerp.com>
Thu, 29 Nov 2012 10:03:42 +0000 (11:03 +0100)
committerChristophe Matthieu <chm@openerp.com>
Thu, 29 Nov 2012 10:03:42 +0000 (11:03 +0100)
bzr revid: chm@openerp.com-20121129100342-gz3hz858ga8ecmre


Trivial merge