Merge branch '77-activate-and-configure-realurl' of...
Merge branch '77-activate-and-configure-realurl' of https://git-t3o.typo3.org/t3o/typo3.org into 77-activate-and-configure-realurl # Conflicts: # html/typo3conf/RealurlConfiguration.php
Merge branch '77-activate-and-configure-realurl' of https://git-t3o.typo3.org/t3o/typo3.org into 77-activate-and-configure-realurl # Conflicts: # html/typo3conf/RealurlConfiguration.php