Merge branch 'MDL-32004-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 01:37:49 +0000 (14:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 01:37:49 +0000 (14:37 +1300)

Trivial merge