Merge branch 'MDL-47189-master-2nd' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 14 Oct 2014 10:34:14 +0000 (18:34 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 14 Oct 2014 10:34:14 +0000 (18:34 +0800)

Trivial merge