Merge branch 'MDL-31853_admin_externalpage_setup' of git://github.com/davosmith/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 14 Mar 2012 01:16:27 +0000 (09:16 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 14 Mar 2012 01:16:27 +0000 (09:16 +0800)
1  2 
lib/adminlib.php

Simple merge