Merge branch 'MDL-44670-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 03:05:31 +0000 (11:05 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 03:05:31 +0000 (11:05 +0800)

Trivial merge