Merge branch 'wip-MDL-40343-master' of git://github.com/ds125v/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 04:53:21 +0000 (12:53 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 04:53:21 +0000 (12:53 +0800)
Conflicts:
mod/forum/styles.css

1  2 
mod/forum/styles.css

Simple merge