Merge branch 'MDL-35760_master' of git://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 22:10:37 +0000 (11:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 22:10:37 +0000 (11:10 +1300)

Trivial merge