Merge branch 'master' into master-forum-extension-tpa
authorFabien Pinckaers <fp@openerp.com>
Sun, 5 Oct 2014 13:35:49 +0000 (15:35 +0200)
committerFabien Pinckaers <fp@openerp.com>
Sun, 5 Oct 2014 13:35:49 +0000 (15:35 +0200)

Trivial merge