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)
commite5d7c55151065484bfbdd1fc60cd78300eef794f
tree208a0aa115dccc437da605055d0ff428755ae95b
parentdd6279788dadaa6097319fbe235344a3a55b10c4
parent908996b10e21e9a72b0babdb2e230732d536649c
Merge branch 'MDL-41258-master' of git://github.com/andrewnicols/moodle

Conflicts:
mod/forum/tests/maildigest_test.php