Merge branch 'MDL-30653-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 23:08:12 +0000 (12:08 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 23:08:12 +0000 (12:08 +1300)

Trivial merge