Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle

diff --cc course/lib.php
Simple merge

diff --cc lib/weblib.php
Simple merge

diff --cc mod/wiki/pagelib.php
Simple merge

diff --cc repository/lib.php
Simple merge