Merge branch 'MDL-39422-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Apr 2013 23:14:12 +0000 (11:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Apr 2013 23:14:12 +0000 (11:14 +1200)

Trivial merge