Merge branch '1.3.x'

stof · stof · commit 9e60b385a763 · 2013-05-25T14:11:33.000+02:00
Conflicts:
	Controller/ChangePasswordController.php
	Controller/GroupController.php
	Controller/ProfileController.php
	Controller/RegistrationController.php
	Controller/ResettingController.php
	Controller/SecurityController.php
	Resources/views/layout.html.twig
diff --git a/Command/ActivateUserCommand.php b/Command/ActivateUserCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * @author Antoine Hérault <antoine.herault@gmail.com>
diff --git a/Command/ChangePasswordCommand.php b/Command/ChangePasswordCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * CreateUserCommand
diff --git a/Command/CreateUserCommand.php b/Command/CreateUserCommand.php
@@ -16,7 +16,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * @author Matthieu Bontemps <matthieu@knplabs.com>
diff --git a/Command/DeactivateUserCommand.php b/Command/DeactivateUserCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * @author Antoine Hérault <antoine.herault@gmail.com>
