Merge branch 'master_MDL-40702' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 01:59:16 +0000 (13:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 01:59:16 +0000 (13:59 +1200)

Trivial merge