Merge branch 'master_MDL-36772' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Nov 2012 21:24:42 +0000 (10:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Nov 2012 21:24:42 +0000 (10:24 +1300)

Trivial merge