Merge branch 'MDL-57844-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 18:53:55 +0000 (19:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 18:53:55 +0000 (19:53 +0100)
commit8abe17288b0a908bb3e1a0adfd79404bb44bfe4b
treefbdaecd696da1e4b65520cc905ded6af470ae544
parentf65a48c50e4de981f80581b3ea28ba72af3e6bba
parent21d9f020ae3ef5c7cbac5c2c4f955e163052ea70
Merge branch 'MDL-57844-master' of git://github.com/dpalou/moodle