Merge branch 'MDL-46375-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Feb 2017 10:34:39 +0000 (10:34 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Feb 2017 10:34:39 +0000 (10:34 +0000)
commit898f227f406c0068b40dd04df78ca7d8ec8888c6
tree28053ccbc42d409f5227b8eb68ebd3e66bce5a40
parent2fe4261efd10d30077f9f87aa6fc21274d9e37ce
parent0c03db6a32fb217756e091b691f1e885b608781b
Merge branch 'MDL-46375-master' of git://github.com/andrewnicols/moodle
lib/moodlelib.php
lib/upgrade.txt