Merge branch 'MDL-37697-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 21:17:01 +0000 (10:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 21:17:01 +0000 (10:17 +1300)

Trivial merge