Merge branch 'MDL-43197-master-2nd' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 05:25:32 +0000 (13:25 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 05:25:32 +0000 (13:25 +0800)

Trivial merge