Merge branch 'MDL-47298-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 8 Oct 2014 11:58:43 +0000 (19:58 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 8 Oct 2014 11:58:43 +0000 (19:58 +0800)

Trivial merge