Merge branch 'MDL-34992' of git://github.com/nebgor/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 21:33:48 +0000 (10:33 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 21:33:48 +0000 (10:33 +1300)

Trivial merge