Merge branch 'MDL-60132-32' of git://github.com/jleyva/moodle into MOODLE_32_STABLE
commitd016049dc93fbfc709c6408c8f0962c9ba517b15
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 20:38:56 +0000 (19 22:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 20:38:56 +0000 (19 22:38 +0200)
tree72a9c1321a9472f665869c63a1793feb36849eee
parenta1a2903db4e771165392234606ed8be1f06cfdda
parent3a960acf1ef95960038409e321183c3adc558104
Merge branch 'MDL-60132-32' of git://github.com/jleyva/moodle into MOODLE_32_STABLE