Merge branch '1.3.x'

Conflicts:
	composer.json

Author: stof

composer.json

@@ -22,17 +22,20 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": ">=2.1,<2.4-dev",
-        "symfony/form": ">=2.1,<2.4-dev",
-        "symfony/security-bundle": ">=2.1,<2.4-dev"
+        "symfony/framework-bundle": "~2.1",
+        "symfony/form": "~2.1",
+        "symfony/security-bundle": "~2.1"
     },
     "require-dev": {
-        "twig/twig": "*",
+        "twig/twig": "~1.5",
         "doctrine/doctrine-bundle": "*",
-        "swiftmailer/swiftmailer": "*",
+        "swiftmailer/swiftmailer": "~4.3",
         "willdurand/propel-typehintable-behavior": "dev-master",
-        "symfony/yaml": "2.1.*",
-        "symfony/validator": "2.1.*"
+        "symfony/yaml": "~2.1",
+        "symfony/validator": "~2.1"
+    },
+    "suggest": {
+        "willdurand/propel-typehintable-behavior": "Needed when using the propel implementation"
     },
     "autoload": {
         "psr-0": { "FOS\\UserBundle": "" }