moved
Merge branch 'master' of https://github.com/ametaireau/pelican

Conflicts:
	README.rst