Merge branch 'MDL-36760' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 21:41:41 +0000 (10:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 21:41:41 +0000 (10:41 +1300)

Trivial merge