Merge branch 'wip-MDL-40167-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 05:25:54 +0000 (13:25 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 05:25:54 +0000 (13:25 +0800)
1  2 
lib/classes/component.php

Simple merge