Merge branch 'MDL-22043-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 02:54:12 +0000 (15:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 02:54:12 +0000 (15:54 +1300)

Trivial merge