Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 21:13:50 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 21:13:50 +0000 (23:13 +0200)
commit18ccaca2e2d125ab084a5f8a40ed222ecbd1d752
tree3a99af470f4c5111717be27201470a80e67b1d94
parent394372b7da258b09b6ceb09352cd198b24cb13f0
parent11b0c8e0e62750b0c6d4f26448140dc02812577b
Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle

Conflicts:
lang/en/moodle.php
lang/en/moodle.php
lib/moodlelib.php
mod/quiz/locallib.php