Merge branch 'm28_MDL-46325' of git://github.com/totara/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 29 Jul 2014 03:58:24 +0000 (11:58 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 29 Jul 2014 03:58:24 +0000 (11:58 +0800)

Trivial merge