Merge branch 'MDL-39650-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 04:11:54 +0000 (14:11 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 04:11:54 +0000 (14:11 +1000)

Trivial merge