Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 13 Sep 2011 00:45:34 +0000 (12:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 13 Sep 2011 00:45:34 +0000 (12:45 +1200)
commit62b214d9a6f036c620cbed4dccecc804f3419376
tree3dfba23f6ff9e1849e71f06ae4a5642608490e74
parent452b166526ccdc8472a605bb655fb144128a7df9
parent138c76789b641af252c3af75360e3bee9234d1c9
Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle
course/lib.php
lib/weblib.php
mod/wiki/pagelib.php
repository/lib.php