[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Fri, 3 May 2013 14:00:29 +0000 (16:00 +0200)
committerChristophe Matthieu <chm@openerp.com>
Fri, 3 May 2013 14:00:29 +0000 (16:00 +0200)
bzr revid: chm@openerp.com-20130503140029-vv7u9gjmax73qyta


No differences found