# HG changeset patch
# User cavaliet
# Date 1339082417 -7200
# Node ID 67402eef14a8bcf2ba2f8caf5b5a66dead1d6b84
# Parent 262fcc5feb5261adb0f71fb0be1449450bb2f525# Parent d4f46999d6bc8432bc604aaa5ed69474b93f8211
Merge with d4f46999d6bc8432bc604aaa5ed69474b93f8211
diff -r 262fcc5feb52 -r 67402eef14a8 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py Thu Jun 07 17:19:40 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py Thu Jun 07 17:20:17 2012 +0200
@@ -19,7 +19,7 @@
'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.8', 'local':"django-extensions-0.8.tar.gz"},
'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/ubernostrum/django-registration/get/v0.8.tar.gz', 'local':"django-registration-0.8.tar.gz"},
'DJANGO-TAGGING': { 'setup': 'django-tagging', 'url':'http://django-tagging.googlecode.com/files/django-tagging-0.3.1.tar.gz', 'local':"django-tagging-0.3.1.tar.gz"},
- 'DJANGO-PISTON': { 'setup': 'django-piston', 'url':"https://bitbucket.org/jespern/django-piston/get/default.tar.gz", 'local':"django-piston.tar.gz"},
+ 'DJANGO-PISTON': { 'setup': 'django-piston', 'url':'django-piston-7c90898072ce-modifed.tar.gz', 'local':'django-piston-7c90898072ce-modifed.tar.gz'},
'OAUTH2': { 'setup': 'python-oauth2', 'url':"https://github.com/simplegeo/python-oauth2/tarball/hudson-python-oauth2-211", 'local':"oauth2-1.5.211.tar.gz"},
'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'http://code.google.com/p/httplib2/downloads/detail?name=httplib2-0.7.4.tar.gz&can=2&q=', 'local':"httplib2-0.7.4.tar.gz"},
'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'http://bitbucket.org/david/django-oauth-plus/get/f314f018e473.gz', 'local':"django-oauth-plus.tar.gz"},
diff -r 262fcc5feb52 -r 67402eef14a8 virtualenv/res/src/fabric-1.4.2.tar.gz
Binary file virtualenv/res/src/fabric-1.4.2.tar.gz has changed
diff -r 262fcc5feb52 -r 67402eef14a8 web/tralalere/templates/player.html
--- a/web/tralalere/templates/player.html Thu Jun 07 17:19:40 2012 +0200
+++ b/web/tralalere/templates/player.html Thu Jun 07 17:20:17 2012 +0200
@@ -4,7 +4,7 @@
{% endblock %}
{% block main_content %}
-{% thumbnail content.image "135x120" format="PNG" crop="center" as im %}
+{% thumbnail content.image "213x190" format="PNG" crop="center" as im %}