Merge branch 'MDL-32065-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 20:24:58 +0000 (09:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 20:24:58 +0000 (09:24 +1300)

Trivial merge