Merge branch 'MDL-48639' of git://github.com/timhunt/moodle
commitb44a858ff12ed23ed8f2e65206cc43d6f5a579bb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Dec 2014 18:09:43 +0000 (22 19:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Dec 2014 18:09:43 +0000 (22 19:09 +0100)
tree40c2afc8d81b7f87d38e50a4cec5b46e1b7cc79e
parenta62de06e57412d88d081468b58056213db74aa25
parent16282275d10baaf28243e79d8873b16c80e6e88f
Merge branch 'MDL-48639' of git://github.com/timhunt/moodle