Merge branch 'MDL-57890-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 16:53:37 +0000 (17:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 16:53:37 +0000 (17:53 +0100)
commit8b1af72760feaf49baba8a5ba6ede588dc21b622
tree58efaf5d32a5a1057f67a7d12bc83a9abb8554d4
parent11db8fe2b9eb33ab8ad0063f7061034285131b37
parent16840c7126f2492cc0b0138f661cd19117119b54
Merge branch 'MDL-57890-master' of git://github.com/dpalou/moodle