Merge branch 'master' of ssh://review.typo3.org:29418/TYPO3CMS/Extensions/pagenotfoun...
authorChristian Futterlieb <christian@futterlieb.ch>
Mon, 23 Jun 2014 14:03:52 +0000 (16:03 +0200)
committerChristian Futterlieb <christian@futterlieb.ch>
Mon, 23 Jun 2014 14:03:52 +0000 (16:03 +0200)

Trivial merge