Merge branch 'MDL-47739-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 21 Oct 2014 01:44:01 +0000 (14:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 21 Oct 2014 01:44:01 +0000 (14:44 +1300)
commit7a126c94a426eb7bb9d71a8bd9bfda7a11f945b1
tree64ad2982990957472591e17b6a3e38a78d2f56a4
parent28f1bd0106016ff422b63870b4be6686a1d2aac7
parent74d0ca1543e5a2283ff909c7b31b191aa5cf7558
Merge branch 'MDL-47739-master' of git://github.com/FMCorz/moodle