Henrik Levkowetz 266b7820d0 Merged from log:branch/2.00@2363: Current release branch head to trunk. ... - Legacy-Id: 2365		2010-07-21 12:48:05 +00:00
..
django.conf	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00