Merge branch 'MDL-47133-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 21:34:18 +0000 (10:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 21:34:18 +0000 (10:34 +1300)

Trivial merge