Andrew Godwin 7f3678dc4c Merge branch 'master' into schema-alteration ... Conflicts: django/db/backends/__init__.py django/db/backends/mysql/base.py django/db/backends/oracle/base.py django/db/backends/oracle/creation.py django/db/backends/postgresql_psycopg2/base.py django/db/backends/sqlite3/base.py django/db/models/fields/related.py		2013-04-18 17:16:39 +01:00
..
__init__.py	Merge branch 'master' into schema-alteration	2013-04-18 17:16:39 +01:00
files.py	Fixed #19634 -- Added proper __hash__ methods.	2013-02-25 23:05:20 +01:00
proxy.py	Fixed #13328 -- Ensured that querysets on models with callable defaults can be pickled. No, really this time. Thanks to Alex for his help brainstorming the solution.	2010-04-21 16:34:33 +00:00
related.py	Merge branch 'master' into schema-alteration	2013-04-18 17:16:39 +01:00
subclassing.py	[py3] Removed a remaining use of __metaclass__.	2012-08-14 23:45:12 +02:00