Merge branch '1.3.x'

Conflicts:
	.travis.yml
	composer.json

Author: stof

.travis.yml

@@ -6,8 +6,10 @@ php:
   - 5.5
   - 5.6
   - hhvm
-        
-before_script: composer install --dev --prefer-source
+
+sudo: false
+
+install: composer install
 
 notifications:
   email: [email protected]

composer.json

@@ -19,7 +19,6 @@
             "homepage": "https://github.com/friendsofsymfony/FOSUserBundle/contributors"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.2",
         "symfony/framework-bundle": "~2.3",
@@ -28,9 +27,9 @@
         "symfony/security-bundle": "~2.3"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "*",
-        "swiftmailer/swiftmailer": ">=4.3, <6.0",
-        "willdurand/propel-typehintable-behavior": "dev-master",
+        "doctrine/doctrine-bundle": "~1.3",
+        "swiftmailer/swiftmailer": "~4.3|~5",
+        "willdurand/propel-typehintable-behavior": "~1.0",
         "symfony/yaml": "~2.3",
         "symfony/validator": "~2.3"
     },