Merge branch 'master' into subfolders-8.3
commit47f3fa535c3590da4f4e66b1de1075b5c632d375
authorWilliam McBrine <wmcbrine@gmail.com>
Sat, 26 Jan 2008 16:14:40 +0000 (26 11:14 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Sat, 26 Jan 2008 16:14:40 +0000 (26 11:14 -0500)
treee36d2ee68772cb0f6c8a72e354e71713a45815b0
parent21ec26f750eff397ee0cdca1ad4374cc6f3d95cb
parent7aae9a0a0b4f7b0956ead1dbaa1ef2268c075df7
Merge branch 'master' into subfolders-8.3
plugins/video/video.py