Merge branch 'w04_MDL-37713_m23_testdir' of git://github.com/skodak/moodle into MOODL...
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:53:29 +0000 (17:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:53:29 +0000 (17:53 +1300)

Trivial merge