Merge branch '2.1.x'

Conflicts:
	composer.json

CHANGELOG-2.0.md

@@ -12,6 +12,13 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v2.0.0...v2.0.1
 To generate a changelog summary since the last version, run
 `git log --no-merges --oneline v2.0.0...2.0.x`
 
+* 2.0.2 (2013-06-06)
+
+ * 00e9a49: Allow Symfony dependencies until 3.0
+ * 4b4a56d: Check for "indexes" key in Configuration::getNestings()
+ * 8ffd1a7: Update install version and add links to compatibility info
+ * 58e983f: Document installation via composer in README (closes #271)
+
 * 2.0.1 (2013-04-04)
 
  * f0d3a4d: Ensure mongo extension is available in Travis CI

CHANGELOG-2.1.md

@@ -12,7 +12,11 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v2.1.0...v2.1.1
 To generate a changelog summary since the last version, run
 `git log --no-merges --oneline v2.1.0...2.1.x`
 
-* 2.1.0 (2013-5-15)
+* 2.1.2 (2013-06-06)
+
+ * 00e9a49: Allow Symfony dependencies until 3.0
+
+* 2.1.1 (2013-05-15)
 
  * c05e0ca: Added documentation for ignoring missing hits
  * 00b67fd: Ignore missing index hits

composer.json

@@ -12,10 +12,10 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": ">=2.1,<2.4-dev",
-        "symfony/console": ">=2.1,<2.4-dev",
-        "symfony/form": ">=2.1,<2.4-dev",
-        "symfony/property-access": ">=2.2,<2.4-dev",
+        "symfony/framework-bundle": "~2.1",
+        "symfony/console": "~2.1",
+        "symfony/form": "~2.1",
+        "symfony/property-access": "~2.2",
         "ruflin/elastica": "0.20.5.*@dev",
         "psr/log": "~1.0"
     },