Merge branch 'w04_MDL-37596_m25_schedmaint' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:44:15 +0000 (08:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:44:15 +0000 (08:44 +1300)
1  2 
lib/adminlib.php

Simple merge