Merge branch 'MDL-22469-master' of https://github.com/StudiUM/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:21:13 +0000 (10:21 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:21:13 +0000 (10:21 +1200)

Trivial merge