Merge branch 'MDL-30192' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 23 Nov 2011 01:11:23 +0000 (14:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 23 Nov 2011 01:11:23 +0000 (14:11 +1300)

Trivial merge