Merge branch 'MDL-57868-master' of git://github.com/jleyva/moodle
commit846d8993293a8bfb84f169d2a141978b18954cbe
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 22:37:39 +0000 (13 23:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 22:37:39 +0000 (13 23:37 +0100)
treecda3135dbd2418d4ebf203a396e79dd48770c6e9
parent369df311507bab3aa076aff7cd3fdd2a71d98a91
parent79cc1c4ff6defa5a027b51fd48222f9563e789c2
Merge branch 'MDL-57868-master' of git://github.com/jleyva/moodle