Merge branch 'MDL-55755_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 15:34:21 +0000 (17:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 15:34:21 +0000 (17:34 +0200)
commitb8c5fc862072c7380dc429474d04fae2b721c4d2
tree26614d5bb78bb201b74df4e75591e2f54454a132
parent2a786e7badb96f9b2e290e01f46cf15e98f65e78
parent1ef29fd28ffc0cf47e4cbf50b3c77dc759ccda3a
Merge branch 'MDL-55755_master' of git://github.com/dmonllao/moodle