Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 22:35:23 +0000 (11:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 22:35:23 +0000 (11:35 +1300)

Trivial merge