Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 01:07:08 +0000 (14:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 01:07:08 +0000 (14:07 +1300)

Trivial merge