[MERGE] from parent
authorChristophe Matthieu <chm@openerp.com>
Tue, 23 Jul 2013 13:43:15 +0000 (15:43 +0200)
committerChristophe Matthieu <chm@openerp.com>
Tue, 23 Jul 2013 13:43:15 +0000 (15:43 +0200)
commit38c30dc0631c97dc760885a1c2175a27c35badb1
tree0ab77dd07f491392d5c125b51f7ffd789645b931
parent840f1923a6952f4246176e76db19a7446976ef02
parent77cf08e2dd0eaa87c6e4c5041029c436205502ce
[MERGE] from parent

bzr revid: chm@openerp.com-20130723134315-sw5mkmw95n9hb3pc
addons/website/static/src/js/website.js
addons/website/views/views.xml