Merge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 06:57:08 +0000 (14:57 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 06:57:08 +0000 (14:57 +0800)
1  2 
lib/accesslib.php

Simple merge