Merge branch 'master' into subfolders-8.3
commitb1eab3c1768cb22389a352698d19acb6968f4bb2
authorWilliam McBrine <wmcbrine@gmail.com>
Wed, 30 Jan 2008 02:45:36 +0000 (29 21:45 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Wed, 30 Jan 2008 02:45:36 +0000 (29 21:45 -0500)
tree50bce68592f829df76a7710a82287260d5fe527a
parent9b7ef7cc6752301bcfbee5a67a964808971d5d24
parent01d36f1d8ba93dd875ad8e0c75fe1152ac8a0832
Merge branch 'master' into subfolders-8.3
plugins/video/video.py