Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:47:40 +0000 (01:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:47:40 +0000 (01:47 +0200)
Conflicts:
mod/forum/tests/behat/behat_mod_forum.php


Trivial merge