Manuel Raynaud 51cd9f4ee8 Merge branch 'master' into frontend ...

Conflicts:
	templates/default/layout.tpl

2013-10-25 14:51:34 +02:00

..

Thelia

Merge branch 'master' into frontend

2013-10-25 14:51:34 +02:00