1
0
mirror of https://github.com/django/django.git synced 2025-04-25 01:34:38 +00:00
Andrew Godwin 9daf81b94e Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/db/models/loading.py
2013-06-19 12:05:23 +01:00
..
2013-05-17 18:08:58 +02:00