Merge branch 'MDL-48307-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:14:25 +0000 (00:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:28:02 +0000 (00:28 +0100)
1  2 
mod/wiki/parser/markups/wikimarkup.php