Merge branch 'wip-MDL-40091-MOODLE_23_STABLE' of git://github.com/satrun77/moodle...
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 03:42:55 +0000 (15:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 03:42:55 +0000 (15:42 +1200)

Trivial merge