Merge branch MDL-29186-master of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Sep 2011 08:06:21 +0000 (16:06 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Sep 2011 08:06:21 +0000 (16:06 +0800)
commitd1e362405e617ea95ae65cccba33e92e4380b777
treeea95a58c4c2dd506e9ffbc3be0c97a5715d22169
parent7eae2c5ae2d2001fef660d7a5101f356f8472231
parent91d284c1450f4a07519bc12257ba04e987de95ff
Merge branch MDL-29186-master of git://github.com/samhemelryk/moodle
- resolved conflicts, minor whitespace and fixed quote.
- note: textlib_get_instance() is already deprecated
17 files changed:
admin/registration/forms.php
backup/util/ui/renderer.php
blog/lib.php
blog/rsslib.php
course/delete.php
course/lib.php
course/report/completion/index.php
enrol/authorize/localfuncs.php
enrol/authorize/uploadcsv.php
enrol/flatfile/lib.php
enrol/paypal/ipn.php
lib/navigationlib.php
mod/feedback/mapcourse.php
notes/index.php
tag/coursetags_more.php
user/lib.php
user/view.php