Merge branch 'wip-MDL-36795-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 22:22:08 +0000 (11:22 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 22:22:08 +0000 (11:22 +1300)

Trivial merge