Merge branch 'wip-MDL-40088-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 00:14:17 +0000 (12:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 00:14:17 +0000 (12:14 +1200)

Trivial merge