# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1368453328 -7200
# Node ID 7b33e9b0b1f0f83d57bcf055f0feb5d689738378
# Parent  9262ac3a72c10a76b8bbd87c019dc41fc917b3b7# Parent  e4606424681f73a02e164ac35984350fc6f24d68
Merge with e4606424681f73a02e164ac35984350fc6f24d68

diff -r 9262ac3a72c1 -r 7b33e9b0b1f0 .hgtags
--- a/.hgtags	Mon May 13 14:23:28 2013 +0200
+++ b/.hgtags	Mon May 13 15:55:28 2013 +0200
@@ -30,3 +30,5 @@
 8a667bb502993b9aca9e41f04d5166396b3d8ad1 V02.08.11
 224c3a44056b54fb2c6d87f7033c7288db47dcf9 V02.08.12
 d027f7adad037575e353d87f8946bd872e8e5054 V02.08.13
+ad105f4a95221d09bf58dbf62c31aaf3290d8e09 V02.08.14
+8d3948b137812ffd826fba490ba0c92f6d7a9ab3 V02.08.15
diff -r 9262ac3a72c1 -r 7b33e9b0b1f0 src/ldtplatform/__init__.py
--- a/src/ldtplatform/__init__.py	Mon May 13 14:23:28 2013 +0200
+++ b/src/ldtplatform/__init__.py	Mon May 13 15:55:28 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (2, 8, 13, "final", 0)
+VERSION = (2, 8, 15, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 9262ac3a72c1 -r 7b33e9b0b1f0 src/requirement.txt
--- a/src/requirement.txt	Mon May 13 14:23:28 2013 +0200
+++ b/src/requirement.txt	Mon May 13 15:55:28 2013 +0200
@@ -1,3 +1,2 @@
-ldt (==1.46.9)
-hashcut (==0.9)
-django-chunked-uploads (==HEAD)
+ldt (==1.46.10)
+hashcut (==0.10)
diff -r 9262ac3a72c1 -r 7b33e9b0b1f0 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Mon May 13 14:23:28 2013 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Mon May 13 15:55:28 2013 +0200
@@ -28,7 +28,7 @@
     'DJANGO_OPENID_CONSUMER': {'setup':'django_openid_consumer', 'url':'http://pypi.python.org/packages/source/d/django-openid-consumer/django-openid-consumer-0.1.1.tar.gz', 'local':"django-openid-consumer-0.1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'SOCIAL_AUTH': {'setup':'social_auth', 'url':'https://github.com/omab/django-social-auth/tarball/v0.3.10', 'local':"omab-django-social-auth-v0.3.10-modified.tar.gz", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
     'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.7.5.tar.gz', 'local':"south-0.7.5.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-    'DJANGO_GUARDIAN' : { 'setup': 'django-guardian', 'url':'http://pypi.python.org/packages/source/d/django-guardian/django-guardian-1.0.3.tar.gz', 'local':"django-guardian-1.0.3.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'DJANGO_GUARDIAN' : { 'setup': 'django-guardian', 'url':'https://github.com/lukaszb/django-guardian/archive/9e18609c69cfc4f21d9ffe6bfa47bc14e2c8cf23.zip', 'local':"django-guardian-9e18609c69cfc4f21d9ffe6bfa47bc14e2c8cf23.zip", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'SORL_THUMBNAIL' : { 'setup': 'sorl-thumbnail', 'url':'https://github.com/sorl/sorl-thumbnail/archive/master.tar.gz', 'local':"sorl-thumbnail-v11.12.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'LIBJPEG': {'setup': None, 'url':'jpegsrc.v9.tar.gz', 'local':'jpegsrc.v9.tar.gz', 'install': {'method': 'install_libjpeg', 'option_str': None, 'dict_extra_env': None}},
     'ZLIB': {'setup': None, 'url':'zlib-1.2.7.tar.gz', 'local':'zlib-1.2.7.tar.gz', 'install': {'method': 'install_zlib', 'option_str': None, 'dict_extra_env': None}},
diff -r 9262ac3a72c1 -r 7b33e9b0b1f0 virtualenv/res/src/django-guardian-1.0.3.tar.gz
Binary file virtualenv/res/src/django-guardian-1.0.3.tar.gz has changed
diff -r 9262ac3a72c1 -r 7b33e9b0b1f0 virtualenv/res/src/django-guardian-9e18609c69cfc4f21d9ffe6bfa47bc14e2c8cf23.zip
Binary file virtualenv/res/src/django-guardian-9e18609c69cfc4f21d9ffe6bfa47bc14e2c8cf23.zip has changed