Merge branch 'MDL-43281-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 22:22:29 +0000 (11:22 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 22:22:29 +0000 (11:22 +1300)

Trivial merge