Merge branch 'MDL-33191' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:22:12 +0000 (11:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:22:12 +0000 (11:22 +1200)

Trivial merge