Manuel Raynaud eae231148e Merge branch 'admin' ...

Conflicts:
	core/lib/Thelia/Command/AdminUpdatePasswordCommand.php
	core/lib/Thelia/Core/Event/Administrator/AdministratorUpdatePasswordEvent.php

2013-10-30 15:37:33 +01:00

..

Thelia

Merge branch 'admin'

2013-10-30 15:37:33 +01:00