Merge branch 'MDL-58555' of https://github.com/timhunt/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 12:08:27 +0000 (14:08 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 12:08:27 +0000 (14:08 +0200)
commitebebbb307b04f91715a4df147153846e1eea6672
tree3acd81813996b88e5071461435e69b55add6485c
parentf712568c1f7996b26bbcbd57cbc68c16b64547ed
parentc1ac8e7fbf3af0496143214b2b0fdfd9aaa883a3
Merge branch 'MDL-58555' of https://github.com/timhunt/moodle