Merge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:39:14 +0000 (08:39 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:39:14 +0000 (08:39 +1200)

Trivial merge