Merge branch 'MDL-30392' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Nov 2011 23:59:19 +0000 (12:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Nov 2011 23:59:19 +0000 (12:59 +1300)

Trivial merge