Merge branch 'hotfix/hotfix-typos'
Merge branch 'hotfix/fix-typos'
no message
Merge branch 'release' of https://github.com/reeze/tipi

Conflicts:
	book/D-how-to-contribute.markdown
	book/chapt05/05-09-spl.markdown
* php-src
Merge branch 'master' of https://github.com/reeze/tipi
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #4 from dolfly/master

tesa