[MERGE] no website description
authorFabien Pinckaers <fp@openerp.com>
Fri, 23 May 2014 08:20:06 +0000 (10:20 +0200)
committerFabien Pinckaers <fp@openerp.com>
Fri, 23 May 2014 08:20:06 +0000 (10:20 +0200)

Trivial merge