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)
commit62f641efd3d8fc074da96b780b7dd87807477197
tree792a3eaf558ac36dc175d32a971bb1ef4b8344de
parent0e84ecefcc098e1d1082da0468496a9ed03aab35
parentf159bd75adeb54c953e009c7fe7e535ab7593c2e
Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle
mod/wiki/pagelib.php
mod/wiki/styles.css