[MERGE] with latest trunk addons
authorDharmraj Jhala (OpenERP) <dizzy.zala@gmail.com>
Tue, 18 Mar 2014 06:57:16 +0000 (12:27 +0530)
committerDharmraj Jhala (OpenERP) <dizzy.zala@gmail.com>
Tue, 18 Mar 2014 06:57:16 +0000 (12:27 +0530)
commit3566b69374c941cc5c48097af867b3bf7dc8dc05
tree6585be661475018e74ee779fc7fb020e9d6cebca
parentacbdc81d789b2eb1e0d08de5c4a28101fd54dd32
parent5196cd6e8c577d35c5788df70c7c59d8e7176183
[MERGE] with latest trunk addons

bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass
addons/website_event/controllers/main.py
addons/website_event/views/website_event.xml