Merge branch 'MDL-56100-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 20:58:11 +0000 (22:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 20:58:11 +0000 (22:58 +0200)
commit2aa983c0066d38a10b7f588eb7e5cf59e5630cfd
treefe1d2703b5e8412501f1ee48d430c73cc6f078d7
parent087476c71154209dcd5dd71661c1d648d7462954
parent1de06aa19b2f5c7c4c260421af34bd945a20918c
Merge branch 'MDL-56100-master' of https://github.com/mackensen/moodle