Merge remote-tracking branch 'pulzarraider/patch-5' into 2.0

* pulzarraider/patch-5:
  Fix for {@inheritdoc} phpDoc tag.

src/Symfony/Bundle/FrameworkBundle/Routing/Router.php

@@ -44,7 +44,7 @@ class Router extends BaseRouter
     }
 
     /**
-     * @{inheritdoc}
+     * {@inheritdoc}
      */
     public function getRouteCollection()
     {