Merge branch 'master_MDL-40512' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Jul 2013 22:10:11 +0000 (10:10 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Jul 2013 22:10:11 +0000 (10:10 +1200)

Trivial merge