Merge branch 'MDL-30981' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Apr 2012 00:26:41 +0000 (12:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Apr 2012 00:26:41 +0000 (12:26 +1200)

Trivial merge