Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 22:13:32 +0000 (11:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 22:13:32 +0000 (11:13 +1300)

Trivial merge