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)
commit89959d9ad158e31fb62d49ba6bf93786dad9caeb
tree77344bdd76e6a53828aa8ca1637f5a9b70274f6f
parent6bbcf832c493f5a444610c21444fbd9474780682
parentaf62237d0e6e27df868d50848f7098f57c103f86
Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
lib/editor/tinymce/lib.php
lib/moodlelib.php
lib/outputlib.php
lib/outputrenderers.php
lib/setuplib.php
lib/upgrade.txt