Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 10:21:17 +0000 (18:21 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 10:21:17 +0000 (18:21 +0800)
commitc161e4687c6b5331415c4cd8f150e51f6543a986
treec123b277a7f9240da2aff722b912d5743f735de6
parent144f35d9a25497cdc1081855a5e270c62f3accc9
parent2ecd284779811adacb2aa0302d20389b3b74545c
Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle

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