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

Trivial merge