Merge branch 'wip-MDL-40634-m26' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:58:26 +0000 (00:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:58:26 +0000 (00:58 +0200)
1  2 
lib/outputcomponents.php

Simple merge