Merge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 01:04:57 +0000 (09:04 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 01:04:57 +0000 (09:04 +0800)

Trivial merge