[MERGE] from trunk-invite-chm
authorChristophe Matthieu <chm@openerp.com>
Mon, 28 Jan 2013 15:06:37 +0000 (16:06 +0100)
committerChristophe Matthieu <chm@openerp.com>
Mon, 28 Jan 2013 15:06:37 +0000 (16:06 +0100)
commit58a79312d1cda198cb373fbec3adc4493a53296e
tree597ffd779fd6daa5b1f1acd361b476fd833e959f
parentda917762c55156199e0dd291703c4e331e46da8e
parent468fed66be75eec5bc8b2af7a52373c38d09120b
[MERGE] from trunk-invite-chm

bzr revid: chm@openerp.com-20130128150637-nb5q37noz0sioan1