Merge branch 'master_MDL-37524' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Sep 2013 22:42:47 +0000 (10:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Sep 2013 22:42:47 +0000 (10:42 +1200)

Trivial merge