Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 22:58:44 +0000 (11:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 22:58:44 +0000 (11:58 +1300)

Trivial merge