Merge branch 'MDL-32433_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Apr 2012 23:58:17 +0000 (11:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Apr 2012 23:58:17 +0000 (11:58 +1200)

Trivial merge