Merge branch '41988-26' of git://github.com/samhemelryk/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 00:01:17 +0000 (10:01 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 00:01:17 +0000 (10:01 +1000)

Trivial merge