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

Conflicts:
	lib/thirdpartylibs.xml
This commit is contained in:
Eloy Lafuente (stronk7) 2011-10-25 01:21:09 +02:00
commit 4ecbf079b5
2 changed files with 0 additions and 81 deletions

View file

@ -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>
<version></version>
<licenseversion></licenseversion>
</library>
<library>
<location>html2text.php</location>
<name>HTML2Text</name>