Merge branch '42805-26' of git://github.com/samhemelryk/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 11 Nov 2013 10:48:39 +0000 (21:48 +1100)
committerMarina Glancy <marina@moodle.com>
Mon, 11 Nov 2013 10:48:39 +0000 (21:48 +1100)

Trivial merge