Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 22:32:13 +0000 (11:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 22:32:13 +0000 (11:32 +1300)

Trivial merge