Merge branch 'w42_MDL-29671_m22_odbc' of git://github.com/skodak/moodle

Conflicts:
	lib/thirdpartylibs.xml

diff --cc lib/thirdpartylibs.xml
index e582b64,2b4c2a8..222203e
--- 1/lib/thirdpartylibs.xml
--- 2/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@@ -252,13 -252,13 +252,6 @@@
      <version></version>
      <licenseversion>2.0+</licenseversion>
    </library>
--  <library>
-     <location>odbc.php</location>
-     <name>ODBC server/client</name>
-     <license>Public Domain</license>
 -    <location>base32.php</location>
 -    <name>Base32 Library</name>
 -    <license>GPL/PHP</license>
--    <version></version>
-     <licenseversion></licenseversion>
 -    <licenseversion>2.0+/2.0.2</licenseversion>
--  </library>
    <library>
      <location>html2text.php</location>
      <name>HTML2Text</name>