Merge branch 'MDL-49894-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 15:10:23 +0000 (16:10 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 15:10:23 +0000 (16:10 +0100)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge