Merge branch 'master_MDL-32002' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Aug 2012 21:43:44 +0000 (09:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Aug 2012 21:43:44 +0000 (09:43 +1200)
1  2 
lib/adminlib.php

Simple merge