Merge branch 'MDL-36916' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 02:42:13 +0000 (15:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 02:42:13 +0000 (15:42 +1300)

Trivial merge