Merge branch 'MDL-38079_23' of git://github.com/mr-russ/moodle into MOODLE_23_STABLE
authorMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 01:15:54 +0000 (11:15 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 01:15:54 +0000 (11:15 +1000)

Trivial merge