Merge branch 'MDL-25971' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 07:12:18 +0000 (15:12 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 07:12:18 +0000 (15:12 +0800)
1  2 
lib/outputcomponents.php

Simple merge