Merge branch 'master_MDL-30211' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 7 Dec 2011 21:44:47 +0000 (10:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 7 Dec 2011 21:44:47 +0000 (10:44 +1300)

Trivial merge