Merge branch 'MDL-60025-32' of git://github.com/jleyva/moodle into MOODLE_32_STABLE
commit7e14be9814a597829a38d2db2a97486211a54163
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 21:51:12 +0000 (11 23:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 21:51:12 +0000 (11 23:51 +0200)
treeb702ae1d82ecbf63fa09af02865d568beef930e1
parentdf68f1fcbd5df33aac817742238c0ad51baca080
parentb46369041c1571a41344704be661b24ac567a3e5
Merge branch 'MDL-60025-32' of git://github.com/jleyva/moodle into MOODLE_32_STABLE