Merge branch 'MDL-41460-master' of https://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 8 Sep 2013 20:58:44 +0000 (08:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 8 Sep 2013 20:58:44 +0000 (08:58 +1200)
1  2 
lib/classes/component.php

Simple merge