protokoll ...
Merge branch 'master' of https://github.com/shackspace/stupig-protokolle

Conflicts:
	2014-October-17.rst
Merge pull request #21 from mfa/master

protokoll ...