Merge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle
commit0678d092138dfa270e44638243e1dfb97cb2ba7a
authorDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 05:10:41 +0000 (7 13:10 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 05:10:41 +0000 (7 13:10 +0800)
tree3388d8dad82bf32c939c159ab6163dc49a35a545
parent54c4398a6d880dd99fb079acc9b2880eefe4c37f
parentd3adc16e4835798a69bb0181f7a833a7b836ffe3
Merge branch 'wip-MDL-33486-master' of git://github.com/marinaglancy/moodle
mod/wiki/pagelib.php
mod/wiki/renderer.php