Merge branch 'master_MDL-37394' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 22:46:13 +0000 (11:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 22:46:13 +0000 (11:46 +1300)

Trivial merge