Merge branch 'MDL-51914' of git://github.com/timhunt/moodle
commit80ad34e720b670b3c7cfdd3a3c82f5988f667d5a
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Nov 2015 01:42:04 +0000 (3 09:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Nov 2015 01:42:04 +0000 (3 09:42 +0800)
tree590293344213eab4a20713bb133f3de2d9ee5342
parent2cc040c6c054521eb9683bb744ff6d147d784fc6
parent0b4b0a7eea52f73a29a0cd9adcdc8282f73bd6e1
Merge branch 'MDL-51914' of git://github.com/timhunt/moodle