Merge branch 'MDL-47987-master' of git://github.com/andrewnicols/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 3 Nov 2014 09:21:55 +0000 (17:21 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 3 Nov 2014 09:21:55 +0000 (17:21 +0800)
commit8bd6b270b237d1e44512dd1c7201e1b96246673b
tree332f5da87cac271711c15469364654ffabeeb830
parentac87cab989b2edd30f083abc70eb670d6f7dba0f
parent4c340898897b9c1d93822ddd4b3e35181d5cfade
Merge branch 'MDL-47987-master' of git://github.com/andrewnicols/moodle
mod/forum/lang/en/forum.php
mod/forum/lib.php