Merge branch 'MDL-32533-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 05:36:18 +0000 (17:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 05:36:18 +0000 (17:36 +1200)

Trivial merge