Merge branch 'MDL-55237_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Aug 2016 10:54:46 +0000 (12:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Aug 2016 10:54:46 +0000 (12:54 +0200)
commit4bdb1298c41f3c9830581e96d309329e54023a77
tree8cb03c3a05c7a43bcb1f8e4def99f8bf5b74e143
parentdacfc6f81659697dcf77495cc31028deb5154bae
parent8bee2d8df6410ec0b0f64ddacac715bb454fceeb
Merge branch 'MDL-55237_master' of git://github.com/dmonllao/moodle