stoffed
Merge branch 'master' of github.com:henrikbjorn/PhpSpecAutoloadExtension

Conflicts:
	AutoloadExtension.php