Merge branch 'MDL-25883-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 01:35:19 +0000 (14:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 01:35:19 +0000 (14:35 +1300)

Trivial merge