Merge "[Task] Update changelog and version to 6.0.0-dev"
authorMarc Bastian Heinrichs <typo3@mbh-software.de>
Mon, 21 May 2012 21:32:58 +0000 (23:32 +0200)
committerGerrit Code Review <gerrit@review.typo3.org>
Mon, 21 May 2012 21:32:58 +0000 (23:32 +0200)

Trivial merge