Merge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 22:13:54 +0000 (11:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 22:13:54 +0000 (11:13 +1300)

Trivial merge