Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 02:09:26 +0000 (10:09 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 02:09:26 +0000 (10:09 +0800)
commit234fdc206c10184650649c513b973a7b244dd270
tree000fd3fe208a53b5aa946827d7c89d4460b84971
parent008a6514aeefbe1d5e556b4f417787f57384ca22
parent506522d582582b4afa6c541cdd57042ed076b59d
Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle

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