Merge branch 'w29_MDL-27464_m22_continue' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 03:03:34 +0000 (11:03 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 03:03:34 +0000 (11:03 +0800)
1  2 
lib/setuplib.php

Simple merge