Merge branch 'MDL-35494_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Nov 2014 21:06:00 +0000 (10:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Nov 2014 21:06:00 +0000 (10:06 +1300)

Trivial merge