diff --git a/ChangeLog b/ChangeLog
index df4df704df51ec6927e0fe2575574d79b9454cd4..c30f1febe4d82cea6b3d291a524127ffcf80f86e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,211 @@
+2012-06-27  d43ea22                  [RELEASE] Release of TYPO3 6.0.0alpha2 (TYPO3 Release Team)
+2012-06-27  40e6768                  [TASK] Raise submodule pointer (TYPO3 Release Team)
+2012-06-27  d4ba789  #38428          [BUGFIX] Bootstrap_BaseSetup::getPathThisScript is not static (Georg Ringer)
+2012-06-24  4302056  #38357          [TASK] Add travis configuration file (Helmut Hummel)
+2012-06-24  b75bdff  #38350          [BUGFIX] Backup global vars in DriverRegistryTest (Helmut Hummel)
+2012-06-24  23a2dbc  #38349          [BUGFIX] Use the TestFinder to determine fixture path (Helmut Hummel)
+2012-06-24  1bf9ae6  #38344          [TASK] Encapsulate bootstrap base code (Christian Kuhn)
+2012-06-24  304cdab  #38331          [BUGFIX] CamelCased class names impossible with empty cache (Christian Kuhn)
+2012-06-24  57b516d  #38347          [TASK] CGL cleanup for the new module menu classes (Susanne Moog)
+2012-06-24  a3f6f26  #36541          [BUGFIX] Wrong margin calculation for Text/Image (derhansen)
+2012-06-24  e2c10e4                  [TASK] Raise submodule pointer (Christian Kuhn)
+2012-06-24  da64930  #38138          [FEATURE] Add module menu object to the TYPO3 backend (Susanne Moog)
+2012-06-23  f117012  #38336          [TASK] Remove empty init() method from EXT:tsconfig_help (Andy Grunwald)
+2012-06-23  2f2c906  #38335          [TASK] Remove empty constructors in EXT:form (Andy Grunwald)
+2012-06-23  7c8608d  #38332          [TASK] Remove empty method from t3lib_file_Repository_FileCollectionRepo (Andy Grunwald)
+2012-06-23  fb4f4fc  #38333          [TASK] Remove empty constructor from t3lib_spritemanager_SimpleHandler (Andy Grunwald)
+2012-06-23  899b13a  #38334          [TASK] Remove empty constructor from localRecordList (Andy Grunwald)
+2012-06-23  c50007f  #37915          [FEATURE] Cache negative ux_* look up in autoloader (Christian Kuhn)
+2012-06-23  1c17582  #38238          [BUGFIX] Refactor page renderer (Dominique Feyer)
+2012-06-23  39c8c82  #38325          [TASK] Fix CGL violations against DoubleQuoteUsage (Ludwig Rafelsberger)
+2012-06-23  c82e19f                  [TASK] Raise submodule pointer (Christian Kuhn)
+2012-06-23  cfe1743  #38321          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-23  38dded5  #38322          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-23  a73e787  #37906          [BUGFIX] sys_action toolbar items doesn't go to right submodule (Soren Malling)
+2012-06-22  325c9e6  #38320          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-22  64daaef  #38319          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-22  afc2299  #38318          [TASK] Clean up phpDoc comments in typo3/sysext/saltedpasswords (Wouter Wolters)
+2012-06-22  6ccf0ec  #38317          [TASK] Clean up phpDoc comments in typo3/sysext/rsaauth (Wouter Wolters)
+2012-06-22  85af2b7  #38303          [TASK] Fix CGL violations against DoubleQuoteUsage (Ludwig Rafelsberger)
+2012-06-22  b80dc31  #38315          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-22  60eb6ff  #38293          [BUGFIX] Missing class definitions in core autoloader (Oliver Hader)
+2012-06-22  7a1282e  #38276          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-22  54e3b7e  #37868          [TASK] Follow-Up: favicon for backend window (Stefan Galinski)
+2012-06-22  98e34ba                  [TASK] Clean up phpDoc comments in typo3/sysext/ (Benjamin Mack)
+2012-06-22  001dc18  #38256          [BUG] FAL: Signals for IndexerService are named wrong (Benjamin Mack)
+2012-06-21  d7253a3  #38273          [TASK] Remove last XCLASS statements (Christian Kuhn)
+2012-06-21  e4303bb  #38269          [TASK] Move GlobalScope template-init to Bootstrap (Steffen Ritter)
+2012-06-21  26b884b  #38267          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in /typo3/sysext/ (Roland Waldner)
+2012-06-21  15fa51e  #38265          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in /typo3/ (Roland Waldner)
+2012-06-21  662f75a  #38266          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-21  91d3e51  #38131          [TASK] Followup: Remove require statements for classes (Steffen Ritter)
+2012-06-21  d5923c9  #38131          [TASK] Remove require statements for classes (Benjamin Mack)
+2012-06-21  a79a442  #38264          [TASK] Fix CGL violations against DoubleQuoteUsage (Ludwig Rafelsberger)
+2012-06-21  020a4a6  #36300          [BUGFIX] Properly load existing usergroups in task (Bart Dubelaar)
+2012-06-21  d6c6599  #38262          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-21  c6e84a4  #38242          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-21  53d7fc0  #38241          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-20  5d2eb8f                  [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-20  3abdb73  #38079          [TASK] Fix CGL violations DoubleQuoteUsage (Ludwig Rafelsberger)
+2012-06-20  408934b  #38113          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-20  3e5cf22  #38119          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-20  0e6162b  #38116          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-20  3a9dc18  #38125          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-20  73feafc  #38143          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-20  5feafd2  #38231          [TASK] Clean up php doc headers in pageRenderer (Helmut Hummel)
+2012-06-20  7d6e17f  #38234          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-20  0437c78  #38132          [TASK] Move all init.php code in global scope into methods (Helmut Hummel)
+2012-06-18  075e913  #36308          [BUGFIX] Correct Path Calculation in Cardlayout (Kay Strobach)
+2012-06-18  002ca39  #38083          [FEATURE] Add scheduler task to update language packages (Xavier Perseguers)
+2012-06-17  919230b  #38134          [TASK] Restructure bootstrap classes (Christian Kuhn)
+2012-06-17  ea1f2cc                  [TASK] Raise submodule pointer (TYPO3 v4 Release Team)
+2012-06-17  c4742c3  #38128          [TASK] Remove t3lib/config_default.php (Christian Kuhn)
+2012-06-17  6e2e47b  #38123          [FEATURE] Check in Reports module for old XCLASS methods (Jigal van Hemert)
+2012-06-17  ae005fd  #38126          [!!!][TASK] Load main configuration file in functional context (Helmut Hummel)
+2012-06-17  721fe2a  #38124          [!!!][TASK] Load extension configuration in function context (Helmut Hummel)
+2012-06-16  564a5a7  #38122          [!!!][TASK] Move inclusion of ext_tables.php to bootstrap classes (Christian Kuhn)
+2012-06-16  2d445bb  #38127          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-16  c06ce81  #38121          [TASK] Use singleton objects for bootstrapping (Oliver Hader)
+2012-06-16  c2ad547  #38115          [BUGFIX] t3lib_file_Utility_FileExtensionFilterTest fails (Oliver Hader)
+2012-06-16  1279cd4  #38117          [TASK] Remove the function index (Oliver Klee)
+2012-06-16  32abd66                  [TASK] Use master branches of submodules (Oliver Hader)
+2012-06-16  a2e6be9  #38098          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-16  27673d8  #38112          [TASK] Move config_default functions to Bootstrap classes (Christian Kuhn)
+2012-06-16  c4c18d8  #38114          [BUGFIX] Exception on modifying page properties (Oliver Hader)
+2012-06-16  67c0469  #38105          [FEATURE] Use mod dispatcher for lowlevel extensions (Susanne Moog)
+2012-06-16  1f4bd21  #38103          [FEATURE] Use mod dispatcher for filelist module (Susanne Moog)
+2012-06-16  80e1daa  #38099          [FEATURE] Use mod dispatcher for the perm extension (Susanne Moog)
+2012-06-16  9de5ab8  #38107          [BUGFIX] t3editor broken after tstemplate refactoring (Susanne Moog)
+2012-06-16  d18cfb6  #38109          [FEATURE] Use mod dispatcher for the indexed_search extension (Susanne Moog)
+2012-06-16  87ce64c  #38106          [TASK] Split t3lib/config_default.php code into functions (Christian Kuhn)
+2012-06-16  227c539                  [TASK] Raise extbase submodule pointer (Christian Kuhn)
+2012-06-15  b3bba72  #38104          [BUGFIX] Remove bogus template in template analyzer (Helmut Hummel)
+2012-06-15  64bfd7d  #38102          [FEATURE] Use mod dispatcher for opendocs extension (Susanne Moog)
+2012-06-15  9cf9591  #38093          [FEATURE] Use mod dispatcher for tstemplate extensions (Susanne Moog)
+2012-06-15  8e40027  #38089          [TASK] Streamline naming of Typo3_Bootstrap (Oliver Hader)
+2012-06-15  603b732                  Revert "[TASK] Streamline typo3/classes naming" (Oliver Hader)
+2012-06-15  5c3e82a  #38096          [FEATURE] Use mod dispatcher for setup extension (Susanne Moog)
+2012-06-15  32c37eb  #38087          [TASK] Streamline typo3/classes naming (Oliver Hader)
+2012-06-15  f9de285  #37353          [BUGFIX] Non-pagetree context menus broken (Stefan Galinski)
+2012-06-15  038f951  #38092          [TASK] Move default TYPO3_CONF_VARS from config_default to own file (Christian Kuhn)
+2012-06-15  0c8187d  #38090          [FEATURE] Use mod dispatcher for cshmanual (Susanne Moog)
+2012-06-15  b964dad  #38081          [TASK] Remove TYPO3_tables_script and handling (Christian Kuhn)
+2012-06-15  3a6e803  #38078          [TASK] Replace duplicate code with a bootstrap method call (Helmut Hummel)
+2012-06-15  de4d0e7  #38080          [FEATURE] Use mod dispatcher for tsconfig_help (Susanne Moog)
+2012-06-15  e80e921  #37916          [TASK] EXT: viewpage: Reload button (Felix Kopp)
+2012-06-15  65eb72e  #38059          [TASK] Fix CGL violations against DoubleQuoteUsage (Ludwig Rafelsberger)
+2012-06-15  efa837c  #37971          [TASK] Clean up phpDoc comments in typo3/ (Wouter Wolters)
+2012-06-15  54ab6f3                  [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-14  6bc116e  #36947          [BUGFIX] Fix refactoring regression in imagecopyresized (Lorenz)
+2012-06-14  1f85736  #37974          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in /typo3/ (Roland Waldner)
+2012-06-14  801cdf0                  [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-14  d31386f                  [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-14  a75b834  #38057          [TASK] Clean up phpDoc comments in typo3/sysext/ (Wouter Wolters)
+2012-06-14  23d029a  #37980          [TASK] Clean up phpDoc comments in typo3/ (Wouter Wolters)
+2012-06-14  0c2caac  #37968          [TASK] Clean up phpDoc comments in typo3/ (Wouter Wolters)
+2012-06-14  c4e549f  #37964          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in sysext "cms" (Roland Waldner)
+2012-06-14  4fdf21c  #37978          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in sysext lowlevel (Roland Waldner)
+2012-06-14  378f4a2  #37975          [TASK] Clean up phpDoc comments in typo3/ (Wouter Wolters)
+2012-06-14  7b24f4e  #37976          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in sysext impexp (Roland Waldner)
+2012-06-14  cdcd2e7  #37977          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in sysext install (Roland Waldner)
+2012-06-14  e56608f  #37972          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in /typo3/ (Roland Waldner)
+2012-06-14  e40cade  #38027          [TASK] Fix CGL violations against DoubleQuoteUsage (Ludwig Rafelsberger)
+2012-06-14  257010c  #38027          [TASK] Fix CGL violations against DoubleQuoteUsage (Ludwig Rafelsberger)
+2012-06-14  11026a7  #37979          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in sysext (Roland Waldner)
+2012-06-13  2436ff8  #37944          [TASK] Add plugin name to page module's CE (Georg Ringer)
+2012-06-13  19bd984  #37973          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in /t3lib/ (Roland Waldner)
+2012-06-13  cdc8e95  #37983          [TASK] Fix very last CGL violation "SemicolonSpacingIncorrect" (Roland Waldner)
+2012-06-13  fad6966  #35944          [BUGFIX] Hide the field "Selected Pages" for menu type "Sitemap" (Marco Huber)
+2012-06-12  8350466  #37937          [TASK] Clean up phpDoc comments in typo3/ (Wouter Wolters)
+2012-06-12  82cd724  #37930          [TASK] Reduce concatenation CGL violations in css_styled_content (Roland Waldner)
+2012-06-12  e765ddc  #37927          [TASK] Reduce concatenation CGL violations in /typo3/classes/ (Roland Waldner)
+2012-06-12  ea398c2  #37924          [TASK] Clean up phpDoc comments in typo3/ (Wouter Wolters)
+2012-06-12  19575fa  #37923          [TASK] Fix concatenation CGL violations in /t3lib/ (Roland Waldner)
+2012-06-11  dd88532  #37917          CGL FunctionCallArgumentSpacingNoSpaceAfterComma in setup (Ludwig Rafelsberger)
+2012-06-11  4f73988  #35154          [BUGFIX] Exclude E_STRICT from error reporting (Steffen Müller)
+2012-06-11  2c5ca9e  #37918          [TASK] Clean up phpDoc comments in typo3/ (Wouter Wolters)
+2012-06-11  8a8cf93  #37913          [TASK] Clean up phpDoc comments in typo3/ (Wouter Wolters)
+2012-06-11  430258f  #37789          [TASK] Harmonize coding style of if constructs in /typo3/sysext/cms/ (Roland Waldner)
+2012-06-11  ce1c982  #37790          [TASK] Harmonize coding style of if constructs in /t3lib/ (Roland Waldner)
+2012-06-11  7d4f675  #37870          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in indexed_search (Roland Waldner)
+2012-06-11  395ae41  #37909          [TASK] Clean up phpDoc comments in typo3/ (Wouter Wolters)
+2012-06-11  6107e21  #37869          [TASK] Clean up phpDoc comments in typo3/classes (Wouter Wolters)
+2012-06-11  c2f7051  #37880          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in saltedpasswords (Roland Waldner)
+2012-06-11  7ecce5f  #37871          [TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in statictemplates (Roland Waldner)
+2012-06-11  f5040a7  #37868          [TASK] favicon for backend window (Felix Kopp)
+2012-06-11  c54b75a  #37875          [TASK] Assignment arithmetic and comparison space missing in typo3/mod (Wouter Wolters)
+2012-06-11  af798fc  #37874          [TASK] Clean up phpDoc comments in typo3/interfaces (Wouter Wolters)
+2012-06-10  c1103a6  #37355          [TASK] Add unit tests for GET/POST input related methods in t3lib_div (Tolleiv Nietsch)
+2012-06-10  47f22af  #37690          [TASK] Reduce CGL violations DoubleQuoteUsageNotRequired in /typo3/ (Roland Waldner)
+2012-06-10  924e112  #37495          [TASK] CGL violations DoubleQuoteUsage in t3lib/ (Wouter Wolters)
+2012-06-10  68781dc  #37774          [TASK] CGL FunctionCallArgumentSpacingNoSpace in fe_adminLib.inc (Roland Waldner)
+2012-06-10  bdaa170  #37713          [TASK] Increase readability of CLI messages (Ingo Pfennigstorf)
+2012-06-10  185297b  #37709          [TASK] CGL: fix FunctionCallArgumentSpacingNoSpaceAfterComma violations (Felix Kopp)
+2012-06-09  04a9266  #37775          [TASK] CGL FunctionCallArgumentSpacingNoSpace in plaintextLib.inc (Roland Waldner)
+2012-06-09  941f7dd  #37827          [TASK] CGL: Improve function spacing (Felix Kopp)
+2012-06-09  aa19150  #37540          [BUGFIX] Missing typehint in abstract FAL driver (Andreas Wolf)
+2012-06-06  83f4d78  #37776          [TASK] Harmonize coding style of if constructs in /typo3/classes/ (Roland Waldner)
+2012-06-05  3ddeb77  #37721          [TASK] self:: is not used for local static member reference (Wouter Wolters)
+2012-06-04  ee53e85  #27020          [BUGFIX] TCEForms.Suggest wizard in IRRE records (Nicole Cordes)
+2012-06-03  3d2ec56  #37707          [TASK] CGL FunctionCallArgumentSpacingTooMuchSpaceAfterComma (Roland Waldner)
+2012-06-03  e801656  #37708          [TASK] Reduce CGL violations InlineCommentWrongStyle (Roland Waldner)
+2012-06-01  1b738d2  #37687          [TASK] Fix CGL violations against InlineCommentWrongStyle (Roland Waldner)
+2012-06-01  7f5498b  #37693          [TASK] Reduce CGL violations OpeningFunctionBraceKernighanRitchieSpace (Roland Waldner)
+2012-06-01  76151f6  #37620          [TASK] Clean up the phpDoc of t3lib/interfaces/ (Wouter Wolters)
+2012-06-01  bf14350  #37697          [TASK] Clean up the phpDoc of t3lib/thumbs.php (Wouter Wolters)
+2012-06-01  cb28d9c  #37649          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/s*/ (Roland Waldner)
+2012-06-01  12ba71c  #37659          [TASK] Clean up phpDoc comments in t3lib classes (Wouter Wolters)
+2012-06-01  a42a609  #37652          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/w*/ (Roland Waldner)
+2012-06-01  4bb34eb  #37650          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/t*/ (Roland Waldner)
+2012-06-01  068d260  #37583          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/l*/ (Roland Waldner)
+2012-06-01  be8f32e  #37616          [TASK] Clean up the phpDoc of t3lib/l10n/ (Wouter Wolters)
+2012-06-01  9008499  #37587          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/p*/ (Roland Waldner)
+2012-06-01  40f498c  #37685          [TASK] Fix CGL violations InlineCommentWrongStyle in ext_emconf.php files (Roland Waldner)
+2012-06-01  b71613c  #37675          [TASK] CGL violations DoubleQuoteUsageNotRequired in indexed_search/ (Roland Waldner)
+2012-06-01  27b4a33  #37678          [TASK] Reduce CGL violations DoubleQuoteUsageNotRequired in install/ (Roland Waldner)
+2012-06-01  60250fb  #37682          Reduce CGL violations FunctionCallArgumentSpacingTooMuchSpaceAfterComma (Roland Waldner)
+2012-06-01  9275ac6  #37513          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/i*/ (Roland Waldner)
+2012-06-01  643df0a  #37500          [BUGFIX ] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/cms/ (Roland Waldner)
+2012-06-01  f8700d4  #37657          [TASK] Reduce CGL violations FunctionCallArgumentSpacingSpaceBeforeComma (Roland Waldner)
+2012-06-01  b46eebb  #37651          [TASK] Clean up the phpDoc of t3lib/extjs/ (Wouter Wolters)
+2012-06-01  0268975  #37658          [TASK] Clean up the phpDoc of t3lib/error/ (Wouter Wolters)
+2012-05-30  bfc1fb5  #37251          [FEATURE] Use FAL file extension filter in TCA (Ingmar Schlecht)
+2012-05-30  1b5cdc5  #36816          [FEATURE] Limit file extensions in FAL element browser (Ingmar Schlecht)
+2012-05-30  16ba61b  #37489          [BUGFIX] CGL violations DoubleQuoteUsageContainsVar (Roland Waldner)
+2012-05-30  ea009d6  #37579          [TASK] Clean up the phpDoc of t3lib/stddb/ (Wouter Wolters)
+2012-05-30  71d386b  #37337          [TASK] Clean up the phpDoc of t3lib_tceforms (Wouter Wolters)
+2012-05-30  b9521bf  #37581          [TASK] Clean up the phpDoc of t3lib/search/ (Wouter Wolters)
+2012-05-30  dbc458d  #37586          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/o*/ (Roland Waldner)
+2012-05-30  202f43b  #37590          [TASK] Clean up the phpDoc of t3lib/mail/ (Wouter Wolters)
+2012-05-30  7e58fa8  #37588          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/r*/ (Roland Waldner)
+2012-05-30  79b794f  #37580          [TASK] Clean up the phpDoc of t3lib/spritemanager/ (Wouter Wolters)
+2012-05-30  f8ead2a  #37589          [TASK] Clean up phpDoc comments in t3lib classes (Wouter Wolters)
+2012-05-29  2d7dd47  #37556          [TASK] Clean up the phpDoc of t3lib/tree/ (Wouter Wolters)
+2012-05-29  ef03bc4  #37557          [TASK] Clean up the phpDoc of t3lib/tceforms/ (Wouter Wolters)
+2012-05-29  4838ad8  #37555          [TASK] Clean up the phpDoc of t3lib/utility/ (Wouter Wolters)
+2012-05-28  0ceccb6  #37553          [BUGFIX] Illegal string offset (Jigal van Hemert)
+2012-05-28  0d30763  #37491          [BUGFIX ] CGL violations FunctionCallArgumentSpacing in /typo3/ (Roland Waldner)
+2012-05-28  6ea9839  #37545          [TASK] Clean up the phpDoc of t3lib_treeview (Wouter Wolters)
+2012-05-28  375ef2b  #37499          [BUGFIX] CGL violations FunctionCallArgumentSpacing in sysext/beuser/ (Roland Waldner)
+2012-05-28  9a70704  #37331          [BUGFIX] CGL violations FunctionCallArgument in indexed_search (Roland Waldner)
+2012-05-27  1374ced  #37502          [TASK] Remove commented-out code (Oliver Klee)
+2012-05-27  30512b3  #37511          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/e*/ (Roland Waldner)
+2012-05-27  1c0d823  #37510          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/c*/ (Roland Waldner)
+2012-05-27  1bf8a81  #37512          [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/f*/ (Roland Waldner)
+2012-05-25  ff439e0  #37380          [TASK] Clean up the phpDoc of t3lib_tcemain (Wouter Wolters)
+2012-05-25  6c20460  #37488          [BUGFIX] CGL violations FunctionCallArgumentSpacingSpaceBeforeComma (Roland Waldner)
+2012-05-25  7b741f1  #37342          [TASK] Add unittest for url parameter related functions (Tolleiv Nietsch)
+2012-05-25  03316ee  #37328          [BUGFIX ] CGL violations FunctionCallArgumentSpacing in alt_doc.php (Roland Waldner)
+2012-05-25  c430920  #37329          [BUGFIX ] CGL violations FunctionCallArgumentSpacing in wizard_forms.php (Roland Waldner)
+2012-05-24  6498bbd  #37249          [FEATURE] Enable overriding element browser type (Ingmar Schlecht)
+2012-05-24  a0d489d  #37330          [TASK] Clean up the phpDoc of t3lib_tceforms_inline (Wouter Wolters)
+2012-05-24  aafcdf2  #29698          [FEATURE] New login error hook (Simon Schaufelberger)
+2012-05-24  91b1c11  #37447          [TASK] Add a comment for require(Bootstrap.php) (Oliver Klee)
+2012-05-24  cd60c05  #37450          [TASK] Clean up phpDoc comments in t3lib classes (Wouter Wolters)
+2012-05-23  d50de32                  [TASK] Set TYPO3 version to 6.0-dev (TYPO3 v4 Release Team)
+2012-05-23  4b4debd                  [RELEASE] Release of TYPO3 6.0.0alpha1 (TYPO3 v4 Release Team)
+
+
 2012-05-23  5ba5f59                  [RELEASE] Release of TYPO3 6.0.0alpha1 (TYPO3 v4 Release Team)
 2012-05-22  37912b3                  [TASK] Raise submodule pointer (TYPO3 v4 Release Team)
 2012-05-21  7a56e06  #36976          [BUGFIX] PHP warning when a language pack does not exist (Xavier Perseguers)
diff --git a/typo3/classes/Bootstrap/BaseSetup.php b/typo3/classes/Bootstrap/BaseSetup.php
index a0fef87daa3537bf3e3fa76d7847a62aa3dc66ab..425ad5479c5c4c647f5a35f2e6def81f0c46cd60 100644
--- a/typo3/classes/Bootstrap/BaseSetup.php
+++ b/typo3/classes/Bootstrap/BaseSetup.php
@@ -93,7 +93,7 @@ class Typo3_Bootstrap_BaseSetup {
 	 */
 	protected static function defineBaseConstants() {
 			// This version, branch and copyright
-		define('TYPO3_version', '6.0-dev');
+		define('TYPO3_version', '6.0.0alpha2');
 		define('TYPO3_branch', '6.0');
 		define('TYPO3_copyright_year', '1998-2012');