Merge branch 'master_MDL-46775' of git://github.com/totara/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 03:21:22 +0000 (11:21 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 03:21:22 +0000 (11:21 +0800)

Trivial merge