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

diff --cc lib/upgrade.txt
Simple merge