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)
commitd7c194547262ead71dbb7280b58e0e103b6bf979
tree9d219935ed70b8fd1b2c9873642a6cae0cc7ed56
parentd9033c0e6d5dd4bd0c684fc042cebc6afbc02aed
parentfbfc7d252c8e3915a7fcf3d5b34b24bbe117ac65
Merge branch 'wip-MDL-40343-master' of git://github.com/ds125v/moodle

Conflicts:
mod/forum/styles.css
mod/forum/styles.css