Merge branch 'MDL-34645' of git://github.com/aolley/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Aug 2012 23:05:24 +0000 (11:05 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Aug 2012 23:05:24 +0000 (11:05 +1200)

Trivial merge