Alexis Metaireau 371892ceaa Merge branch tests into main. (See #44) ... Conflicts: pelican/contents.py pelican/settings.py samples/pelican.conf.py		2011-05-10 23:18:11 +01:00
..
__init__.py	Merge branch tests into main. (See #44)	2011-05-10 23:18:11 +01:00
test_contents.py	Merge branch tests into main. (See #44)	2011-05-10 23:18:11 +01:00
test_settings.py	Merge branch tests into main. (See #44)	2011-05-10 23:18:11 +01:00