Merge branch 'wip-MDL-43348_master' of git://github.com/gjb2048/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 01:10:15 +0000 (14:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 01:10:15 +0000 (14:10 +1300)

Trivial merge