Merge branch 'MDL-43109' of https://github.com/mdikih/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2014 20:51:27 +0000 (21:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2014 20:51:27 +0000 (21:51 +0100)
1  2 
mod/wiki/pagelib.php

Simple merge