Merge branch 'MDL-36826-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 22:38:57 +0000 (11:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 22:38:57 +0000 (11:38 +1300)

Trivial merge