Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 05:19:36 +0000 (13:19 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 05:19:36 +0000 (13:19 +0800)
1  2 
lib/adminlib.php

Simple merge