Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Apr 2012 00:34:37 +0000 (12:34 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Apr 2012 00:34:37 +0000 (12:34 +1200)
commit5bfeb5ffd39f2b0c73c9b6cb679949a71936ef7c
treed436fe21b525c8f2558522293e248634c7ef123c
parent859a181627ba3afb8da2a3f1c2bdac4d83b360d2
parentf9f281b8fee75c2416d71bae7583fd026b9ccabb
Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle
13 files changed:
auth/shibboleth/config.html
calendar/renderer.php
grade/report/grader/lib.php
lang/en/moodle.php
lib/questionlib.php
lib/weblib.php
message/lib.php
mod/data/field/file/field.class.php
mod/data/field/picture/field.class.php
mod/quiz/editlib.php
mod/wiki/renderer.php
repository/alfresco/lib.php
user/index.php