Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 20:15:53 +0000 (09:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 20:15:53 +0000 (09:15 +1300)

Trivial merge