Merge branch 'w41_MDL-29602_m22_accesslib' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2011 11:15:13 +0000 (13:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2011 11:15:13 +0000 (13:15 +0200)
1  2 
lib/datalib.php
lib/moodlelib.php

diff --cc lib/datalib.php
Simple merge
Simple merge