Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 19:54:58 +0000 (21:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 19:54:58 +0000 (21:54 +0200)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge