Merge branch 'MDL-27304-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 04:20:01 +0000 (17:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 04:20:01 +0000 (17:20 +1300)

Trivial merge