Merge branch 'master_MDL-41144' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 23:01:51 +0000 (11:01 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 23:01:51 +0000 (11:01 +1200)

Trivial merge