Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Dec 2014 18:52:40 +0000 (18:52 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Dec 2014 18:52:40 +0000 (18:52 +0000)
1  2 
lib/outputcomponents.php
theme/upgrade.txt

Simple merge
Simple merge