Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:23:04 +0000 (11:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:23:04 +0000 (11:23 +1300)
commit124932d223357b9a520655843c46553301fe64e9
tree5f783c32682373be686092da87c8ec44429e66af
parentef547170249efe2edf9d49e7ad3659ee29682790
parent2ccbcf01698f0c46cf6deaaa12a3a38aa630b096
Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle