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

Trivial merge