Merge branch 'wip-MDL-43966-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 02:50:55 +0000 (10:50 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 02:50:55 +0000 (10:50 +0800)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge