[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 13:38:13 +0000 (15:38 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 13:38:13 +0000 (15:38 +0200)
commitd04ee666ccb0c35bd1c13d9814fdb52f1159e7e9
treefbb09260a719fc158b6f4087ac16fed36e332ae4
parente53f66dcea9ff012682dcece8e29d179ebe7d339
parent6b84615627dca50a3c07cf80d8da0ea9b2d28934
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140411133813-4rj4de6dlzna5g5s
addons/website/views/snippets.xml