Merge branch 'MDL-42909-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:35:47 +0000 (11:35 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:35:47 +0000 (11:35 +1200)
commitd90b055ab191113c0d244b12937527de79075449
tree0101ffdb3db5e6f7d18c829d709961c7217bd37c
parent424033b780728ba7f1007e13538840661f803862
parent33b6b8c93ec90c4136758a7b0120448b8e265521
Merge branch 'MDL-42909-master' of git://github.com/phalacee/moodle