merged 2.0

Author: fabpot

deps

@@ -39,7 +39,7 @@
 [SensioFrameworkExtraBundle]
     git=http://github.com/sensio/SensioFrameworkExtraBundle.git
     target=/bundles/Sensio/Bundle/FrameworkExtraBundle
-    version=origin/2.0
+    version=origin/master
 
 [JMSSecurityExtraBundle]
     git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git
@@ -49,10 +49,12 @@
 [SensioDistributionBundle]
     git=http://github.com/sensio/SensioDistributionBundle.git
     target=/bundles/Sensio/Bundle/DistributionBundle
+    version=origin/master
 
 [SensioGeneratorBundle]
     git=http://github.com/sensio/SensioGeneratorBundle.git
     target=/bundles/Sensio/Bundle/GeneratorBundle
+    version=origin/master
 
 [AsseticBundle]
     git=http://github.com/symfony/AsseticBundle.git
@@ -62,3 +64,4 @@
 [DoctrineBundle]
     git=http://github.com/doctrine/DoctrineBundle.git
     target=/bundles/Doctrine/Bundle/DoctrineBundle
+    version=origin/master

deps.lock

@@ -13,4 +13,4 @@ JMSSecurityExtraBundle 3a728757abc2dd5ab357caded801d5d7e2436539
 SensioDistributionBundle 64ae64795c794e34d964a67e76f0584444189fc2
 SensioGeneratorBundle 0d58617cbde570803c2f00dc03f3acffce0cf28f
 AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16
-DoctrineBundle 807485d7781323c2ea12991138340b60f34d3a5d
+DoctrineBundle 807485d7781323c2ea12991138340b60f34d3a5d