Merge branch 'MDL-40054_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 23:01:54 +0000 (12:01 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 23:01:54 +0000 (12:01 +1300)

Trivial merge