Merge branch 'wip-MDL-39062-m26' of git://github.com/samhemelryk/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 15 Jul 2013 02:40:46 +0000 (12:40 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 15 Jul 2013 02:40:46 +0000 (12:40 +1000)

Trivial merge