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

Trivial merge