[MERGE] from trunk-openchatter-chm
authorChristophe Matthieu <chm@openerp.com>
Mon, 1 Oct 2012 17:56:59 +0000 (19:56 +0200)
committerChristophe Matthieu <chm@openerp.com>
Mon, 1 Oct 2012 17:56:59 +0000 (19:56 +0200)
commiteaf0b9da2f8ccd298a1821660ef1f2d43a10ad55
treebe43c05796d6fde4408d74bf474e079d98d1e299
parentf0e4dfe42fdbe2cca07c536132b14f1f8e6fbb40
parent728d7492592d4a6995969691cad18422e845bd83
[MERGE] from trunk-openchatter-chm

bzr revid: chm@openerp.com-20121001175659-u71443g719eu9x5l