Merge branch 'MDL-55557_m32v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 11:45:18 +0000 (12:45 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 11:45:18 +0000 (12:45 +0100)
1  2 
mod/wiki/locallib.php

Simple merge