Merge branch 'master' into subfolders-8.3
commitc1b332e4f850b9ad301e660bf9e3650418110bf6
authorWilliam McBrine <wmcbrine@gmail.com>
Wed, 6 Feb 2008 16:28:42 +0000 (6 11:28 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Wed, 6 Feb 2008 16:28:42 +0000 (6 11:28 -0500)
tree296e2cb55e9cae51f7a01e76da338a510a3ca82b
parent0881542dd5604ded6bd86d37990b9a562341f417
parent01c74f13d44a76fd55c642f64de0d8d0d7048c08
Merge branch 'master' into subfolders-8.3
plugins/video/video.py