Merge branch 'MDL-32353' of git://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 03:14:45 +0000 (15:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 03:14:45 +0000 (15:14 +1200)

Trivial merge