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

Trivial merge