Merge branch 'MDL-47195-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 10:07:23 +0000 (11:07 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 10:07:23 +0000 (11:07 +0100)
1  2 
lib/classes/component.php
lib/thirdpartylibs.xml

Simple merge
Simple merge