Merge branch 'wip-mdl-40427' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 08:00:12 +0000 (16:00 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 08:00:12 +0000 (16:00 +0800)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge