Merge branch 'MDL-25981'
authorPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 21:44:17 +0000 (22:44 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 21:44:17 +0000 (22:44 +0100)
1  2 
course/lib.php
lib/moodlelib.php
lib/navigationlib.php
lib/weblib.php
mod/forum/lib.php

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