1
0
mirror of https://github.com/django/django.git synced 2025-02-28 11:34:28 +00:00
Andrew Godwin de64c4d6e9 Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
2013-08-09 14:17:30 +01:00
..
2013-03-22 13:50:07 -04:00
2013-03-22 13:50:07 -04:00
2013-03-28 15:03:19 -05:00
2013-07-09 23:04:37 +02:00