Merge branch 'MDL-30302-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:56:29 +0000 (16:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:56:29 +0000 (16:56 +1300)

Trivial merge