Merge branch 'wip-MDL-40650-master' of git://github.com/abgreeve/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 15 Jul 2013 02:25:23 +0000 (12:25 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 15 Jul 2013 02:25:23 +0000 (12:25 +1000)

Trivial merge