Merge branch 'MDL-35730' of https://github.com/aolley/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 21:06:30 +0000 (10:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 21:06:30 +0000 (10:06 +1300)

Trivial merge