Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 03:47:24 +0000 (16:47 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 03:47:24 +0000 (16:47 +1300)
commit7b604fd9f1cb67275f18a862789562d70c8fa6a1
tree0917258f0157dd7deef8a8898bda0fcacf329ff7
parentea1720be991fbb68262a75da794e9378ad53cd0a
parentc159e2aa0aa5ac4d25c842d4b0ce4233056777f5
Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle