Merge branch 'MDL-50937-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jul 2016 09:27:10 +0000 (10:27 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jul 2016 09:27:10 +0000 (10:27 +0100)
1  2 
lib/thirdpartylibs.xml
lib/upgrade.txt

Simple merge
diff --cc lib/upgrade.txt
Simple merge