Merge branch 'MDL-37350-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:55:05 +0000 (08:55 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:55:05 +0000 (08:55 +1300)

Trivial merge