Merge branch 'MDL-55124' of https://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Sep 2016 22:52:30 +0000 (00:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Sep 2016 22:52:30 +0000 (00:52 +0200)
commit64573a35e959c844c009e50c4a736032783351c7
treeb1ce8feb43593827b7e634549ea1b7d26fad9fad
parent948e6e3fcafda07869c4bf8981224387cb3a95cf
parentd59f1d3150a6fce02cc876a6bdb6c7968b652fe7
Merge branch 'MDL-55124' of https://github.com/mr-russ/moodle