[MERGE] from parent

author Xavier Morel <xmo@openerp.com>

Fri, 4 Oct 2013 14:50:46 +0000 (16:50 +0200)

committer Xavier Morel <xmo@openerp.com>

Fri, 4 Oct 2013 14:50:46 +0000 (16:50 +0200)
author Xavier Morel <xmo@openerp.com>
Fri, 4 Oct 2013 14:50:46 +0000 (16:50 +0200)
committer Xavier Morel <xmo@openerp.com>
Fri, 4 Oct 2013 14:50:46 +0000 (16:50 +0200)
diff --cc addons/website/controllers/main.py
Simple merge
diff --cc addons/website/static/src/css/editor.css
Simple merge
diff --cc addons/website/static/src/css/editor.sass
Simple merge
author	Xavier Morel <xmo@openerp.com>
	Fri, 4 Oct 2013 14:50:46 +0000 (16:50 +0200)
committer	Xavier Morel <xmo@openerp.com>
	Fri, 4 Oct 2013 14:50:46 +0000 (16:50 +0200)
		1	2
addons/website/controllers/main.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/css/editor.css	patch \|	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/css/editor.sass	patch \|	diff1 \|	diff2 \|	blob \| history