Merge branch 'MDL-44739-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 06:24:54 +0000 (14:24 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 06:24:54 +0000 (14:24 +0800)

Trivial merge