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)
commitfb1788c598b4e3076492ad50de72a2734e0ddcdf
tree823a92979ea8d27b3042ae92b90261e8173fea14
parent68d9f1327306b12aab6c908dc90d52b16bf50b2b
parent2e4c0c9181b3c7b69798fd37bd97d8486cf71c04
Merge branch 'MDL-40424-master' of git://github.com/FMCorz/moodle

Conflicts:
admin/oacleanup.php
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