Merge branch 'MDL-26337' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 21:15:30 +0000 (22:15 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 21:15:30 +0000 (22:15 +0100)
1  2 
lib/weblib.php

diff --cc lib/weblib.php
Simple merge