Merge branch 'master' into subfolders-8.3
commit0881542dd5604ded6bd86d37990b9a562341f417
authorWilliam McBrine <wmcbrine@gmail.com>
Wed, 6 Feb 2008 04:29:57 +0000 (5 23:29 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Wed, 6 Feb 2008 04:29:57 +0000 (5 23:29 -0500)
treefed8e17f7d8b81bae0df0bb861c30598ef0776bf
parentd0d8c3997ba42c8d4baf7ddfc74cad4e45e4bed3
parent23b6a0212ea322ac8756f5b844cdea14e4559c29
Merge branch 'master' into subfolders-8.3
plugins/video/video.py