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)
commitf5360dd16b03701a1bf264b2a7c4bc7a2c4bbabf
tree8e7022defee7cb56a3456b0ddf9c2661625dacec
parent4b0c38daeeeda291993d3a641c7244259981a2f0
parentba55be9151ce6dae7aec827d00c7b3179612b64f
Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle
lib/outputcomponents.php
theme/upgrade.txt