Merge branch 'MDL-41258-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 18:25:58 +0000 (20:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 18:25:58 +0000 (20:25 +0200)
Conflicts:
mod/forum/tests/maildigest_test.php


Trivial merge