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)
commit8204e5730975e8de75406006f3e62b62634e646e
tree02c0eb81d6ae25503bd4f364698f0d7cc136c19d
parent673c671be0004252e947233b064564b9307b8a94
parent0cddd851517d2ddb4f73530fce707e4a7b5c262d
Merge branch 'MDL-36559-master-int' of git://github.com/FMCorz/moodle
lib/adminlib.php
theme/upgrade.txt