Merge branch 'MDL-40425-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 08:42:18 +0000 (16:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 08:42:18 +0000 (16:42 +0800)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge