Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 06:24:04 +0000 (14:24 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Feb 2013 06:24:04 +0000 (14:24 +0800)
1  2 
lang/en/moodle.php
lib/upgrade.txt

Simple merge
diff --cc lib/upgrade.txt
Simple merge