1
0
mirror of https://github.com/django/django.git synced 2025-02-28 11:34:28 +00:00
Andrew Godwin 588b523233 Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/db/models/options.py
2013-08-09 14:37:37 +01:00
..