Merge branch 'MDL-41417_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 8 Sep 2013 22:54:11 +0000 (10:54 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 8 Sep 2013 22:54:11 +0000 (10:54 +1200)

Trivial merge