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)
commit12879418e98121d91ea5e9b77349d066e25f67ed
treea15a8af492954a5e7211cd4a4f831f288061539e
parent23726a43d48ff6657b6ecf53ffb8c8ff186751bb
parentbe0e1825d35032e75b8579393f3953f689dc35b7
Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle

Conflicts:
mod/forum/tests/behat/behat_mod_forum.php