Merge branch 'wip-MDL-19147-master' of git://github.com/abgreeve/moodle
commit51994346197f49c233f607d05face71db2f43115
authorSam Hemelryk <sam@moodle.com>
Wed, 7 Dec 2011 01:20:48 +0000 (7 14:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 7 Dec 2011 01:20:48 +0000 (7 14:20 +1300)
treed7fcd568e609eb9c4c688dd269cb61732ad36ca6
parent42f6b3f1d7c518d9d1e3f3a22ac546793f2af546
parent5fad08b4a43fa5e76fac6c616f3a09aa148968a6
Merge branch 'wip-MDL-19147-master' of git://github.com/abgreeve/moodle
mod/forum/lang/en/forum.php