Merge branch 'w14_MDL-32251_m23_strict3' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 19:17:58 +0000 (21:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 19:17:58 +0000 (21:17 +0200)
1  2 
mod/wiki/locallib.php
mod/wiki/pagelib.php
question/engine/simpletest/testunitofwork.php

Simple merge
Simple merge