Merge branch 'wip-MDL-34785-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 01:36:56 +0000 (13:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 01:36:56 +0000 (13:36 +1200)

Trivial merge