Merge branch 'wip-MDL-35653-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 20:40:55 +0000 (09:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 20:40:55 +0000 (09:40 +1300)

Trivial merge