Merge branch 'w42_MDL-29671_m22_odbc' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 23:21:09 +0000 (01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 23:21:09 +0000 (01:21 +0200)
commit4ecbf079b579c6da58a40d4922a79cab69d11ff8
tree96a7711f8152e3d307dc3705758f33bc7f8601c2
parente1595b32dcc3c98fcad067377ebd8dd20b122a4c
parent210b9b68d292c43580e9ec03c2a306231d83b6ac
Merge branch 'w42_MDL-29671_m22_odbc' of git://github.com/skodak/moodle

Conflicts:
lib/thirdpartylibs.xml
lib/thirdpartylibs.xml