Merge branch 'wip-MDL-31396-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 04:15:56 +0000 (17:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 04:15:56 +0000 (17:15 +1300)

Trivial merge