Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 19:14:36 +0000 (08:14 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 19:14:36 +0000 (08:14 +1300)

Trivial merge