Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit f7327474b3f8 · 2014-09-15T15:21:26.000-04:00
* 2.4:
  Fixed version for composer install

Conflicts:
	quick_tour/the_big_picture.rst
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -20,7 +20,7 @@ directory:
 
 .. code-block:: bash
 
-    $ composer create-project symfony/framework-standard-edition myproject/ '~2.5'
+    $ composer create-project symfony/framework-standard-edition myproject/ '~2.3'
 
 .. note::
 
