Merge branch 'master' into subfolders-8.3subfolders-8.3
commit6dc89b181692a789f149a62adc63471ef922f81a
authorJason Michalski <armooo@armooo.net>
Tue, 4 Dec 2007 02:57:37 +0000 (3 20:57 -0600)
committerJason Michalski <armooo@armooo.net>
Tue, 4 Dec 2007 02:57:37 +0000 (3 20:57 -0600)
treede8a695501432c5961feaaad9eacb2b4e3eb07cf
parentdb5304ba69956c405ec4d52122aeb9d863218024
parent5b28e1c0764cb417669a19ef08b2757615918467
Merge branch 'master' into subfolders-8.3
plugins/video/transcode.py
plugins/video/video.py