Merge branch 'MDL-59453-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:53:00 +0000 (11:53 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:53:00 +0000 (11:53 +0200)
commit10f9517c222448026a34fe5b7692c35f050e4d93
treeedfe747eed4fe183917fbcaf9dca4125dafb3f42
parent7a39523e0ede1fafe0dfaf9d2b5cdaf8f6906bb7
parent41860b7e9ec1b2e2d218cc3bf0583e6e632bcc6f
Merge branch 'MDL-59453-master' of git://github.com/jleyva/moodle