Merge branch 'master' of git://git.typo3.org/TYPO3v4/Extensions/typo3wiki
authorBastian Bringenberg <spam@bastian-bringenberg.de>
Thu, 28 Nov 2013 17:41:32 +0000 (18:41 +0100)
committerBastian Bringenberg <spam@bastian-bringenberg.de>
Thu, 28 Nov 2013 17:41:32 +0000 (18:41 +0100)

Trivial merge