Merge branch 'MDL-54928-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jul 2016 10:20:07 +0000 (11:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jul 2016 10:20:07 +0000 (11:20 +0100)
commit88dd8edf7b25b460b972a382f83b6b1fc73c3dd0
tree481ecf5938027c2615c0c6f18c810e4307a9efd8
parent27ade02c67ba3450c701dc97e5753990995dc556
parent6f2815fa51959b93eaed0613782c818678132489
Merge branch 'MDL-54928-master' of git://github.com/dpalou/moodle