Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 08:45:33 +0000 (16:45 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 08:45:33 +0000 (16:45 +0800)
1  2 
lib/editor/tinymce/lib.php
lib/moodlelib.php
lib/outputlib.php
lib/outputrenderers.php
lib/setuplib.php
lib/upgrade.txt

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/upgrade.txt
Simple merge