Merge branch 'MDL-42801-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 21:19:20 +0000 (10:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 21:19:20 +0000 (10:19 +1300)

Trivial merge