Merge branch '41959-26' of git://github.com/samhemelryk/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 15 Oct 2013 02:19:30 +0000 (13:19 +1100)
committerMarina Glancy <marina@moodle.com>
Tue, 15 Oct 2013 02:19:30 +0000 (13:19 +1100)

Trivial merge