Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:47:59 +0000 (02:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:47:59 +0000 (02:47 +0200)
commitb224448ac6ff1c4c17024ed0f09562567b0448ea
tree53b1064cb6221bc066ac326ed99e3bd93d7f8874
parent0555761203f827414ae017e716c2a5562c90bf09
parent5ffb5fd4b361028fc108726e59fa8a951a401c40
Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle
mod/wiki/pagelib.php