Merge branch 'wip-MDL-41772-master' of git://github.com/abgreeve/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 23 Sep 2013 04:39:45 +0000 (14:39 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 23 Sep 2013 04:39:45 +0000 (14:39 +1000)

Trivial merge