Merge branch 'MDL-34494_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 31 Jul 2012 00:43:44 +0000 (12:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 31 Jul 2012 00:43:44 +0000 (12:43 +1200)

Trivial merge