Merge branch 'wip-MDL-39962-master' of git://github.com/abgreeve/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 10:00:24 +0000 (20:00 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 10:00:24 +0000 (20:00 +1000)

Trivial merge