Merge branch 'MDL-32426-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Apr 2012 23:52:12 +0000 (11:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Apr 2012 23:52:12 +0000 (11:52 +1200)

Trivial merge