Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict...
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 21:33:00 +0000 (10:33 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 21:33:00 +0000 (10:33 +1300)

Trivial merge