Merge branch 'MDL-32142-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 23:01:29 +0000 (12:01 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 23:01:29 +0000 (12:01 +1300)

Trivial merge