django1

Author	SHA1	Message	Date
Aymeric Augustin	3cb2457f46	[py3] Replaced basestring by six.string_types.	2012-07-22 09:29:54 +02:00
Justin Bronn	79e68c225b	Merged the gis branch into trunk. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8219 bcc190cf-cafb-0310-a4f2-bffc1f526a37	2008-08-05 18:13:06 +00:00