Merge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 22:21:19 +0000 (11:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 22:21:19 +0000 (11:21 +1300)

Trivial merge