Merge branch 'MDL-25910_20_wip_mysqlsocket' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 06:18:24 +0000 (14:18 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 06:18:24 +0000 (14:18 +0800)

Trivial merge