Merge branch 'MDL-57916-master' of git://github.com/jleyva/moodle
commit74ccc7768ea8a0c4f703b2ee8a805303d5141a5e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 16:43:24 +0000 (20 17:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 16:53:02 +0000 (20 17:53 +0100)
tree6ebe9685b50eada1fffce8b6d79ad9bfff1940af
parentd8c8082998dab4d4d9d489a741e0b7615a8e719a
parentcac43b9b6a2956878ce23ed1d8f569d9cc4fa2e7
Merge branch 'MDL-57916-master' of git://github.com/jleyva/moodle

Mini bump version in merge...
mod/data/lib.php
mod/data/version.php