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

Trivial merge