Merge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 22:06:39 +0000 (11:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 22:06:39 +0000 (11:06 +1300)
1  2 
lib/adminlib.php

Simple merge