Merge branch 'MDL-34695' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 06:23:29 +0000 (14:23 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 06:23:29 +0000 (14:23 +0800)
1  2 
mod/wiki/pagelib.php

Simple merge