Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 04:40:56 +0000 (12:40 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 04:40:56 +0000 (12:40 +0800)
1  2 
mod/wiki/pagelib.php
mod/wiki/styles.css

Simple merge
Simple merge