Merge branch 'wip-MDL-41715-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 23:44:39 +0000 (11:44 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 23:44:39 +0000 (11:44 +1200)

Trivial merge