Merge branch 'wip-MDL-40540-m26' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 20:56:34 +0000 (22:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 20:56:34 +0000 (22:56 +0200)
1  2 
lib/pagelib.php

diff --cc lib/pagelib.php
Simple merge