Merge branch 'MDL-41632-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:12:32 +0000 (09:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:12:32 +0000 (09:12 +1200)
1  2 
lib/classes/component.php

Simple merge