2 Commits

Author	SHA1	Message	Date
Adrian Holovaty	f69cf70ed8	MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. ... git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2006-05-02 01:31:56 +00:00
Adrian Holovaty	9dda4abee1	MERGED NEW-ADMIN BRANCH (except for po/mo files, which will come in a separate commit) ... git-svn-id: http://code.djangoproject.com/svn/django/trunk@1434 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2005-11-25 21:20:09 +00:00