Merge branch 'master_MDL-40773' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:45:03 +0000 (09:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:45:03 +0000 (09:45 +1200)

Trivial merge