Merge branch 'MDL-36954' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 01:59:56 +0000 (14:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 01:59:56 +0000 (14:59 +1300)

Trivial merge