Merge branch 'MDL-41258-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 21:59:19 +0000 (09:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 21:59:19 +0000 (09:59 +1200)

Trivial merge