Merge branch 'master' into subfolders-8.3
commit778f2cfa64c8ee7827d9effbba9720d9609c039b
authorWilliam McBrine <wmcbrine@gmail.com>
Thu, 17 Jan 2008 03:50:20 +0000 (16 22:50 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Thu, 17 Jan 2008 03:50:20 +0000 (16 22:50 -0500)
tree151cdbd4d5f97c99b3f75d58eff7d56d0b314183
parentf8113cc509f2991141467af919d3e51e91740279
parent9b40acca7fb1109f279baec9bc6fa5b4ecf1ae90
Merge branch 'master' into subfolders-8.3
plugins/video/video.py