Merge branch 'MDL-40424-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 23:21:51 +0000 (01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 23:21:51 +0000 (01:21 +0200)
Conflicts:
admin/oacleanup.php

1  2 
lib/accesslib.php
lib/blocklib.php
lib/enrollib.php
lib/navigationlib.php
lib/tests/accesslib_test.php
lib/upgrade.txt
rating/lib.php
user/externallib.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/upgrade.txt
Simple merge
diff --cc rating/lib.php
Simple merge
Simple merge