Merge branch 'master' into subfolders-8.3
commit2d5fc8dc7dd4d09bb5c0b36509122fee90388494
authorWilliam McBrine <wmcbrine@gmail.com>
Thu, 14 Feb 2008 17:09:12 +0000 (14 12:09 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Thu, 14 Feb 2008 17:09:12 +0000 (14 12:09 -0500)
tree14dc3771b7be1c92d0e0dbd3ecace90171e46fbb
parent293d275917df3795e0f95b44ac7da4d139db7a2b
parentbcf4afb03897b2088278034133b2737cddbfc000
Merge branch 'master' into subfolders-8.3
plugins/video/video.py