Merge branch 'MDL-36559-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:50:31 +0000 (10:50 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:50:31 +0000 (10:50 +0800)
1  2 
lib/adminlib.php
theme/upgrade.txt

Simple merge
Simple merge