Bruno Binet fe9388a7a4 Merge remote-tracking branch 'origin/master' into fix-functional-tests ... Conflicts: tests/support.py		2012-07-05 01:22:31 +02:00
..
content	Add support for status: hidden in pages	2012-06-26 19:26:43 -07:00
pelican.conf.py	fix test_custom_generation_works functional test	2012-07-05 00:12:05 +02:00