Merge branch 'MDL-24235-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 23:22:34 +0000 (12:22 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 23:22:34 +0000 (12:22 +1300)

Trivial merge