Merge branch 's17_MDL-30973_file_docblock_master' of git://github.com/dongsheng/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Feb 2012 23:25:18 +0000 (00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Feb 2012 23:25:18 +0000 (00:25 +0100)
1  2 
mod/assignment/lib.php
mod/data/lib.php
mod/forum/lib.php
mod/glossary/lib.php
mod/lesson/lib.php
mod/quiz/lib.php
mod/scorm/lib.php
mod/wiki/lib.php
mod/workshop/lib.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge