Merge branch 'tests' into dev
Merge branch 'testing' into dev
Merge branch 'dev'
Django_nose problem with GAE
Django 1.7
Merge branch 'master' into dev
pytz update
pytz update
pytz update
django 1.7 config
Fecha actuación y eventos en agenda
tests
Merge branch 'dev' into testing