Merge branch 'w12_MDL-32071_m23_dbfamily' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 22:46:00 +0000 (11:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 22:46:00 +0000 (11:46 +1300)

Trivial merge