Merge branch 'MDL-49599-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Jul 2016 06:53:28 +0000 (08:53 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Jul 2016 06:53:28 +0000 (08:53 +0200)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge