Merge branch '1.2'

Conflicts:
	.travis.yml

Author: wouterj

.travis.yml

@@ -8,18 +8,16 @@ php:
     - hhvm
 
 env: 
-  SYMFONY_VERSION=2.3.*
+  - SYMFONY_VERSION=2.5.*
 
 matrix:
   allow_failures:
     - env: SYMFONY_VERSION=dev-master
   include:
     - php: 5.5
-      env: SYMFONY_VERSION=2.2.*
+      env: SYMFONY_VERSION=2.3.*
     - php: 5.5
       env: SYMFONY_VERSION=2.4.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.5.*
     - php: 5.5
       env: SYMFONY_VERSION=dev-master
 

README.md

@@ -1,6 +1,6 @@
 # Symfony CMF Routing Component
 
-[![Build Status](https://secure.travis-ci.org/symfony-cmf/Routing.png?branch=master)](http://travis-ci.org/symfony-cmf/Routing)
+[![Build Status](https://secure.travis-ci.org/symfony-cmf/Routing.png?branch=1.2)](http://travis-ci.org/symfony-cmf/Routing)
 [![Latest Stable Version](https://poser.pugx.org/symfony-cmf/routing/version.png)](https://packagist.org/packages/symfony-cmf/routing)
 [![Total Downloads](https://poser.pugx.org/symfony-cmf/routing/d/total.png)](https://packagist.org/packages/symfony-cmf/routing)