Merge branch 'MDL-29912' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 26 Oct 2011 23:57:21 +0000 (12:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 26 Oct 2011 23:57:21 +0000 (12:57 +1300)

Trivial merge