Merge branch 'MDL-30175' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Nov 2011 21:57:54 +0000 (10:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Nov 2011 21:57:54 +0000 (10:57 +1300)

Trivial merge