Merge branch 'MDL-37068' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 00:40:08 +0000 (13:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 00:40:08 +0000 (13:40 +1300)

Trivial merge