Merge branch 'MDL-31655-master-3' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 22:28:38 +0000 (11:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 22:28:38 +0000 (11:28 +1300)

Trivial merge