Merge branch 'MDL-48938-master' of git://github.com/jethac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 20:23:30 +0000 (21:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 20:23:30 +0000 (21:23 +0100)
commit8bd49ae9ad2474dd82f5773aacdcae399c7c8c28
tree4cb0dc28457e292ac2b750f43f527dddc7320d36
parent40156b3bec4e6f2852ea72b7bcfe0840f09d7fea
parent1ef484692454b7c0ea49e230140cf37f6cb5f821
Merge branch 'MDL-48938-master' of git://github.com/jethac/moodle