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

Trivial merge