Merge branch 'MDL-34991' of git://github.com/nebgor/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 23:45:00 +0000 (11:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 23:45:00 +0000 (11:45 +1200)

Trivial merge