Merge branch 'MDL-48058-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 00:58:15 +0000 (13:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 00:58:15 +0000 (13:58 +1300)

Trivial merge