Merge branch 'MDL-58874-master' of https://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 May 2017 11:31:24 +0000 (13:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 May 2017 11:31:24 +0000 (13:31 +0200)
commit3a7afbe9cba010e60cf5f463806467220793280f
treecebf36dcda535f255b1bf007bc19c708ef6c431d
parente838654b4ea37de217d096d5fdb56c6abe06e5e4
parent0ac1dcd8d15ea167dfab2d04e62d94001df86f62
Merge branch 'MDL-58874-master' of https://github.com/xow/moodle