Merge branch '42619-26' of git://github.com/samhemelryk/moodle
authorMarina Glancy <marina@moodle.com>
Fri, 1 Nov 2013 02:23:30 +0000 (13:23 +1100)
committerMarina Glancy <marina@moodle.com>
Fri, 1 Nov 2013 02:23:30 +0000 (13:23 +1100)

Trivial merge