Merge branch 'wip-MDL-45348-master' of git://github.com/abgreeve/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 1 May 2014 03:22:54 +0000 (11:22 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 1 May 2014 03:22:54 +0000 (11:22 +0800)

Trivial merge