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)
13 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/weblib.php
Simple merge
diff --cc message/lib.php
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc user/index.php
Simple merge