Merge branch 'wip-mdl-36674' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:15:16 +0000 (10:15 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:15:16 +0000 (10:15 +0800)
1  2 
lib/tests/weblib_test.php
lib/weblib.php

Simple merge
diff --cc lib/weblib.php
Simple merge