Browse files

Merge branch 'master' into pipeline

Conflicts:
	molly/installer/sysprep/packagekit.py
  • Loading branch information...
2 parents 65447b4 + cefa020 commit ba7a23dfc6771a7ec0a62b84a03dee0097279316 @cnorthwood cnorthwood committed Oct 17, 2011
Showing with 3 additions and 3 deletions.
  1. +2 −2 molly/wurfl/management/commands/update_wurfl.py
  2. +1 −1 setup.py
View
4 molly/wurfl/management/commands/update_wurfl.py
@@ -15,8 +15,8 @@ class Command(NoArgsCommand):
requires_model_validation = False
- WURFL_URL = 'http://kent.dl.sourceforge.net/project/wurfl/WURFL/latest/wurfl-latest.xml.gz'
- WEB_PATCH_URL = 'http://wurfl.sourceforge.net/web_browsers_patch.xml'
+ WURFL_URL = 'http://kent.dl.sourceforge.net/project/wurfl/WURFL/2.1.1/wurfl-2.1.1.xml.gz'
+ WEB_PATCH_URL = 'http://kent.dl.sourceforge.net/project/wurfl/WURFL/2.1.1/web_browsers_patch.xml'
def handle_noargs(self, **options):
tempdir = tempfile.mkdtemp()
View
2 setup.py
@@ -91,7 +91,7 @@
"simplejson",
"rdflib",
"python-dateutil==1.5",
- "Django==1.3",
+ "Django==1.3.1",
"oauth==1.0.1",
"psycopg2",
"PIL",

0 comments on commit ba7a23d

Please sign in to comment.