Merge branch 'MDL-52000-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 13:17:10 +0000 (13:17 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 13:17:10 +0000 (13:17 +0000)
commita17820bb70a222e0e32d822c26e1f6097d21c0d9
tree61c214e9fca779f26b1104502fb35a7df53681e0
parent687a268cbd6d3ad2b7b43008dac1adc4f942329e
parent6667ebb98e55e720d9952459ba3de49e32251ea8
Merge branch 'MDL-52000-master' of git://github.com/andrewnicols/moodle