Merge branch 'MDL-36105-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:31:22 +0000 (12:31 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:31:22 +0000 (12:31 +1300)

Trivial merge