franck e672677748 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	templates/admin/default/category-edit.html

2013-09-19 17:27:46 +02:00

..

Thelia

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-19 17:27:46 +02:00