Merge branch 'wip-MDL-44637-master' of git://github.com/abgreeve/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 24 Apr 2014 08:33:57 +0000 (16:33 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 24 Apr 2014 08:33:57 +0000 (16:33 +0800)

Trivial merge