# HG changeset patch
# User cavaliet
# Date 1411037932 -7200
# Node ID 5c2c1dc9a5323bb904565a30ab9f4837c3c5ab04
# Parent  06fa70ece35d86aef7f31bab8346d0d4addd62bd# Parent  7a96f86460f55e6564fe28083ab9e61982180f60
Merge with 7a96f86460f55e6564fe28083ab9e61982180f60

diff -r 7a96f86460f5 -r 5c2c1dc9a532 .hgtags
--- a/.hgtags	Wed Jul 30 03:53:33 2014 +0200
+++ b/.hgtags	Thu Sep 18 12:58:52 2014 +0200
@@ -80,3 +80,4 @@
 4dc95dbe4102fb45c7a6705ee29439f9dce92c1a V02.12.10
 4dc95dbe4102fb45c7a6705ee29439f9dce92c1a V02.12.10
 79486a66b4b119159abd7819d63afc697d9f37de V02.12.10
+f0a6b4c4b3c0aac34f3aeb2fa32da256c5b03a18 V02.12.11
diff -r 7a96f86460f5 -r 5c2c1dc9a532 src/ldtplatform/__init__.py
--- a/src/ldtplatform/__init__.py	Wed Jul 30 03:53:33 2014 +0200
+++ b/src/ldtplatform/__init__.py	Thu Sep 18 12:58:52 2014 +0200
@@ -1,4 +1,4 @@
-VERSION = (2, 12, 10, "final", 0)
+VERSION = (2, 12, 11, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 7a96f86460f5 -r 5c2c1dc9a532 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Wed Jul 30 03:53:33 2014 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Thu Sep 18 12:58:52 2014 +0200
@@ -36,7 +36,7 @@
     'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/toastdriven/django-haystack/archive/v2.0.0.tar.gz', 'local': 'django-haystack-2.0.0.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'REQUESTS': {'setup': 'requests', 'url':'https://github.com/kennethreitz/requests/archive/v1.2.0.tar.gz', 'local':'requests-1.2.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'SIMPLEJSON': {'setup': 'simplejson','url':'https://github.com/simplejson/simplejson/archive/v3.3.0.tar.gz', 'local': 'simplejson-3.3.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
-    'PYELASTICSEARCH': {'setup': 'pyelasticsearch', 'url':'https://github.com/rhec/pyelasticsearch/archive/0.5.tar.gz', 'local':'pyelasticsearch-0.5.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+    'PYELASTICSEARCH': {'setup': 'pyelasticsearch', 'url':'https://pypi.python.org/packages/source/p/pyelasticsearch/pyelasticsearch-0.7.1.tar.gz', 'local':'pyelasticsearch-0.7.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'WHOOSH': {'setup': 'whoosh', 'url':'https://bitbucket.org/mchaput/whoosh/get/tip.tar.gz', 'local':'whoosh-2.5.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'SETUPTOOLS_HG' : {'setup':'setuptools_hg', 'url':'https://bitbucket.org/jezdez/setuptools_hg/get/v0.4.tar.gz', 'local': 'setuptools_hg-0.4.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     # dependencies for Tastypie : mimeparse>=0.1.3, python-dateutil>=2.1, lxml, PyYAML (not necessary but we never know), python-digest, defusedxml
diff -r 7a96f86460f5 -r 5c2c1dc9a532 virtualenv/res/src/pyelasticsearch-0.5.tar.gz
Binary file virtualenv/res/src/pyelasticsearch-0.5.tar.gz has changed
diff -r 7a96f86460f5 -r 5c2c1dc9a532 virtualenv/res/src/pyelasticsearch-0.7.1.tar.gz
Binary file virtualenv/res/src/pyelasticsearch-0.7.1.tar.gz has changed