Merge branch 'MDL-47903-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 12:28:33 +0000 (12:28 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 12:28:33 +0000 (12:28 +0000)
commit1a27142afeeff6611c8f0e4057f94ceca71e0918
treef464db0d98a36bd85f73161229266fd3abc4c651
parenta6d7a812713b4dc2fa3c334d8f73aaf7ff40a32e
parenta54702b234111c846b0cea613288c4017bf81229
Merge branch 'MDL-47903-master' of git://github.com/andrewnicols/moodle

Conflicts:
mod/forum/version.php
    mod/forum/db/upgrade.php
mod/forum/db/upgrade.php
mod/forum/lib.php
mod/forum/version.php