Merge branch 'MDL-59148-master-7' of git://github.com/andrewnicols/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 15:43:07 +0000 (17:43 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:50 +0000 (18:24 +0200)
commit185455dcc3f538622097a857443dcd92fcdea4c6
tree3e6cda374c3f6c32d375fdd50362a7b14f052147
parent0248d168010c833d07f0511abdf1ee5ef9b36b6a
parent0e9911e1432aa9056928cd28f30f901170786a85
Merge branch 'MDL-59148-master-7' of git://github.com/andrewnicols/moodle