Merge branch 'MDL-27901-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 05:01:00 +0000 (13:01 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 05:01:00 +0000 (13:01 +0800)
1  2 
lib/adminlib.php

Simple merge