Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 03:47:17 +0000 (16:47 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 03:47:17 +0000 (16:47 +1300)
1  2 
course/lib.php
lib/upgradelib.php
mod/quiz/lib.php
mod/quiz/mod_form.php
question/engine/questionattempt.php

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