Merge branch 'MDL-48718-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 00:51:44 +0000 (01:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 00:51:44 +0000 (01:51 +0100)
commit6ae45106fc0c25abc1efa01bcbed3235946717cd
tree9f3eaf94d79fba40f073a9874653f31393961481
parent20e955a18ea2d40d00040040fad90c61d31bee8b
parent55a1fe4b8e2037f2edcd6a2c7a68c323d5acaa14
Merge branch 'MDL-48718-master' of git://github.com/jleyva/moodle