Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 05:32:13 +0000 (13:32 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 05:32:13 +0000 (13:32 +0800)

Trivial merge