Merge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 10:20:35 +0000 (12:20 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 10:20:35 +0000 (12:20 +0200)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge