Merge branch 'MDL-57066-32' of git://github.com/junpataleta/moodle into MOODLE_32_STABLE
commit3ec84d746af267a4f6eaf63506e8569dc85c8145
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Mar 2017 23:58:45 +0000 (15 00:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Mar 2017 23:58:45 +0000 (15 00:58 +0100)
tree188fbf802ca519a413119c3e57c66281f9345c58
parentcddbbc17522b50a71b9cf6fdd4196cb2e0841170
parente7714135a476ae4fb7f1b9430ea9fbee921f7128
Merge branch 'MDL-57066-32' of git://github.com/junpataleta/moodle into MOODLE_32_STABLE