Merge branch 'master' into subfolders-8.3
commit7a95873d1ae5488b8c059dbebe10d25ab4500ccc
authorWilliam McBrine <wmcbrine@gmail.com>
Sun, 27 Jan 2008 15:36:48 +0000 (27 10:36 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Sun, 27 Jan 2008 15:36:48 +0000 (27 10:36 -0500)
tree2532a2e0b5625073ee8c3d06ee7dd13ab1d24ee7
parent47f3fa535c3590da4f4e66b1de1075b5c632d375
parent05317e179c8983f3e4677b85316332c99f0ae939
Merge branch 'master' into subfolders-8.3
plugins/video/video.py