Merge branch 'w42_MDL-29878_m22_typo3' of git://github.com/skodak/moodle

diff --combined lib/thirdpartylibs.xml
index 13a9644,713929f..e582b64
--- 1/lib/thirdpartylibs.xml
--- 2/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@@ -60,7 -60,7 +60,7 @@@
      <location>PEAR_GeoIP</location>
      <name>GeoIP</name>
      <license>LGPL</license>
 -    <version>1.0.0RC3</version>
 +    <version>1.0.0</version>
      <licenseversion>2.1+</licenseversion>
    </library>
    <library>
@@@ -221,7 -221,7 +221,7 @@@
      <location>typo3</location>
      <name>Typo3</name>
      <license>GPL</license>
-     <version>4.2.1</version>
+     <version>4.5.0</version>
      <licenseversion>2.0+</licenseversion>
    </library>
    <library>
@@@ -252,6 -252,13 +252,6 @@@
      <version></version>
      <licenseversion>2.0+</licenseversion>
    </library>
 -  <library>
 -    <location>base32.php</location>
 -    <name>Base32 Library</name>
 -    <license>GPL/PHP</license>
 -    <version></version>
 -    <licenseversion>2.0+/2.0.2</licenseversion>
 -  </library>
    <library>
      <location>odbc.php</location>
      <name>ODBC server/client</name>