Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 00:54:22 +0000 (08:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 00:54:22 +0000 (08:54 +0800)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge