Merge branch 'MDL-31329' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 03:28:17 +0000 (11:28 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 03:28:17 +0000 (11:28 +0800)

Trivial merge