Merge branch 'MDL-45186-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 23 Apr 2014 23:01:33 +0000 (11:01 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 23 Apr 2014 23:01:33 +0000 (11:01 +1200)
commita544822bd8ecdecf9d812f38d37c3d235f3fe7c4
tree1d107ed1e203f4e3f9793b0cad72f79525500513
parentd7ef1ac747ca42cac4c5fdf2badf3d377a525310
parent90f9e30b3b34b7e85be4c7887d8a481fd6bbad9e
Merge branch 'MDL-45186-master' of git://github.com/FMCorz/moodle