Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 21:57:29 +0000 (10:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 21:57:29 +0000 (10:57 +1300)

Trivial merge