Merge branch 'MDL-21933_23' of https://github.com/mr-russ/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 03:44:58 +0000 (15:44 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 03:44:58 +0000 (15:44 +1200)

Trivial merge