Merge branch 'wip-MDL-40842-m26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:48:19 +0000 (13:48 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:48:19 +0000 (13:48 +0800)
1  2 
lib/setuplib.php

Simple merge