Merge branch '1.1'

Author: wouterj

.travis.yml

@@ -6,9 +6,16 @@ php:
     - 5.5
 
 env:
-  - SYMFONY_VERSION=2.3.*
   - SYMFONY_VERSION=2.4.*
-  - SYMFONY_VERSION=dev-master
+
+matrix:
+  allow_failures:
+    - env: SYMFONY_VERSION=dev-master
+  include:
+    - php: 5.5
+      env: SYMFONY_VERSION=2.3.*
+    - php: 5.5
+      env: SYMFONY_VERSION=dev-master
 
 before_script:
   - composer self-update
@@ -19,7 +26,3 @@ script: phpunit --coverage-text
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
   email: "symfony-cmf-devs@googlegroups.com"
-
-matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION=dev-master

README.md

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