Merge branch 'MDL-57282-master' of https://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2017 11:38:14 +0000 (12:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2017 11:38:14 +0000 (12:38 +0100)
commit96733b06d634a25dd6ee215aa7447db167631587
treee689d79a6122aed0bb09d72084a3bdf1e959c9b1
parent38425d9fee3dd097cd9f7f4857cb5c3f567649df
parentb7c822a546e1f8797909bf20e4768b9f96190af3
Merge branch 'MDL-57282-master' of https://github.com/xow/moodle