Merge branch 'MDL-30742' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 22:37:10 +0000 (11:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 22:37:10 +0000 (11:37 +1300)

Trivial merge