Merge branch 'wip-MDL-40142-m26' of git://github.com/samhemelryk/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 17 Jun 2013 00:43:29 +0000 (10:43 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 17 Jun 2013 00:43:29 +0000 (10:43 +1000)

Trivial merge