Merge branch 'MDL-31014-master-3' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 02:38:32 +0000 (15:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 02:38:32 +0000 (15:38 +1300)

Trivial merge