Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 20:02:52 +0000 (09:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 20:02:52 +0000 (09:02 +1300)

Trivial merge