Merge branch 'wip-MDL-47299-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 8 Oct 2014 01:07:57 +0000 (14:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 8 Oct 2014 01:07:57 +0000 (14:07 +1300)
1  2 
lib/thirdpartylibs.xml

Simple merge