Merge branch 'MDL-48697-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 01:05:51 +0000 (09:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 01:05:51 +0000 (09:05 +0800)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge