Merge branch 'MDL-35963-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Nov 2012 21:40:58 +0000 (10:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Nov 2012 21:40:58 +0000 (10:40 +1300)

Trivial merge