Merge branch 'master_MDL-32388' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 00:23:23 +0000 (12:23 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 00:23:23 +0000 (12:23 +1200)

Trivial merge