1
0
mirror of https://github.com/django/django.git synced 2025-01-26 18:19:18 +00:00
Andrew Godwin b6a957f0ba Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	docs/ref/django-admin.txt
2013-08-19 18:30:48 +01:00
..