Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 19 Nov 2014 20:12:14 +0000 (09:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 19 Nov 2014 20:12:14 +0000 (09:12 +1300)

Trivial merge