Merge branch '42170-26' of git://github.com/samhemelryk/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 23 Oct 2013 00:43:23 +0000 (11:43 +1100)
committerMarina Glancy <marina@moodle.com>
Wed, 23 Oct 2013 00:43:23 +0000 (11:43 +1100)

Trivial merge