Merge branch 'MDL-57570-master' of https://github.com/mwehr/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Jan 2017 00:27:36 +0000 (01:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Jan 2017 00:27:36 +0000 (01:27 +0100)
commitc5bd22b1ea8965099e2b9396e412d07a04f344fa
treeb322d905f1f1596d0e7f1a68bccf4a9e65ce5872
parent36102596d748215adad3ec67aa37dedfeea1fed4
parent7ca1161645c618b49b5593a6cbbd4f7d028ff790
Merge branch 'MDL-57570-master' of https://github.com/mwehr/moodle