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

Trivial merge