-
Merge branch 'dev' of /src/docutils-ext-mpe into dev

Conflicts:
	dotmpe/du/ext/extractor/htdocs.py
-
Merge branch 'dev' from dandy into dm/github dev

Conflicts:
	dotmpe/du/builder/__init__.py
	dotmpe/du/ext/extractor/htdocs.py
	dotmpe/du/frontend.py