Merge branch 'master' into subfolders-8.3
commit5b250d8dd5a75d6a1a1ed8b32e14d2a2af272748
authorWilliam McBrine <wmcbrine@gmail.com>
Sun, 3 Feb 2008 18:47:39 +0000 (3 13:47 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Sun, 3 Feb 2008 18:47:39 +0000 (3 13:47 -0500)
tree89436150d6eb6d8905e065f3d6803bba62bdafda
parentec5ac22f1f4ce5c2a658d1690fd6ca44c732c643
parent4a83ddd83549b68e4487ffc772d95e3375df1dd6
Merge branch 'master' into subfolders-8.3
plugins/video/video.py