Merge branch 'MDL-39967-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:08:55 +0000 (09:08 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:08:55 +0000 (09:08 +1200)

Trivial merge