Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 08:11:47 +0000 (16:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 08:11:47 +0000 (16:11 +0800)
1  2 
lib/javascript-static.js
lib/thirdpartylibs.xml

Simple merge
Simple merge