Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 02:37:55 +0000 (03:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 02:37:55 +0000 (03:37 +0100)
commit8ac9d33f492f41897ac561c0eb92daf6a9b5d7e7
tree1f85321447ee0592d5ebc7053a9589654d6e1f9a
parent032bfca82a871266a620046e7eb0b799856e4ee8
parentb849c21255ddab171eca5ff25f9b0731829da2d1
Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle

Conflicts:
lib/db/upgrade.php
report/completion/index.php
report/progress/index.php
version.php
lang/en/admin.php
lib/db/upgrade.php
lib/moodlelib.php
mod/assignment/lib.php
mod/forum/lib.php
mod/scorm/report/basic/report.php
report/completion/index.php
report/progress/index.php
theme/base/style/core.css
version.php