Merge branch 'MDL-37628-master' of git://github.com/grabs/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 00:42:07 +0000 (13:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 00:42:07 +0000 (13:42 +1300)

Trivial merge