Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 22:02:19 +0000 (11:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 22:02:19 +0000 (11:02 +1300)

Trivial merge