Merge branch 'w34_MDL-34901_m24_useraccess' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 04:02:17 +0000 (12:02 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 04:02:17 +0000 (12:02 +0800)
1  2 
lib/moodlelib.php

Simple merge