Merge branch 'MDL-40680-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 02:14:27 +0000 (14:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 02:14:27 +0000 (14:14 +1200)

Trivial merge