Merge branch 'wip-MDL-32699-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commitf755c4a8492b68eebe334c93f51124af13d5f80b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Mar 2014 23:19:31 +0000 (12 00:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Mar 2014 23:19:31 +0000 (12 00:19 +0100)
tree9b1bb505bb772c879bff9efe2c617ad961b8200b
parentf3e25119ad172c0d5d8e3cfa316bc5b614cd22c9
parent200cf9a5be062a0a345c04de5b4006bdfb1355b6
Merge branch 'wip-MDL-32699-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
mod/wiki/pagelib.php