Ole Laursen af768fb633 Fix a bunch of merge bugs ... - Legacy-Id: 3191		2011-06-29 13:05:11 +00:00
django	Applied a patch to django's test client, found by olau@: http://code.djangoproject.com/changeset/12343. Fixes issue #359.	2010-08-19 16:20:09 +00:00
etc	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
html5lib	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
ietf	Fix a bunch of merge bugs	2011-06-29 13:05:11 +00:00
permissions	Set svn:ignore *.pyc in new directories.	2011-05-12 14:29:37 +00:00
redesign	Merged in changes from the conversion branch	2011-06-28 18:25:36 +00:00
south	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
static	Merged in changes from the conversion branch	2011-06-28 18:25:36 +00:00
test	Include contributors mentioned in the change log in the notification mail addressees.	2011-05-24 20:56:34 +00:00
workflows	Set svn:ignore *.pyc in new directories.	2011-05-12 14:29:37 +00:00
.gitignore	Fixes #563	2010-12-02 20:34:50 +00:00
changelog	Changelog entry for 3.55	2011-05-24 20:58:54 +00:00
control	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
LICENSE	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
LICENSE.django	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00