Merge branch 'MDL-36271_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 7 Nov 2012 22:07:15 +0000 (11:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 7 Nov 2012 22:07:15 +0000 (11:07 +1300)

Trivial merge