Merge branch 'MDL-55762-master' of git://github.com/ankitagarwal/moodle
commit1e8af135164afe32594badceb197b4b620305f2b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2017 19:38:56 +0000 (28 20:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2017 19:38:56 +0000 (28 20:38 +0100)
tree5dc14c15e25e6f6a5af6ccc6d3c3b99700e355a3
parentf3221d8d791ff42971ff02c8d6db7f524b13d903
parent1f3556b010630e748b697c3091dbaca10544f83e
Merge branch 'MDL-55762-master' of git://github.com/ankitagarwal/moodle