Merge branch 'MDL-48196-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 23:34:02 +0000 (12:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 23:34:02 +0000 (12:34 +1300)

Trivial merge