2 Commits

Author	SHA1	Message	Date
Malcolm Tredinnick	1006d6eb06	Fixed #1530 -- make count() respect distinct() on QuerySets. Create some ... tests for this as well. Thanks to Adam Endicott for the original patch on which this is based. git-svn-id: http://code.djangoproject.com/svn/django/trunk@2902 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2006-05-14 23:49:29 +00:00
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