Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 07:05:15 +0000 (15:05 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 07:05:15 +0000 (15:05 +0800)
1  2 
lib/weblib.php

diff --cc lib/weblib.php
Simple merge