Merge branch 'MDL-39412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 02:12:36 +0000 (12:12 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 02:12:36 +0000 (12:12 +1000)

Trivial merge