Merge branch 'master' into beta-540
commit9d2500bbcd1d97f52cce5c21a6802a6d4a9b8ec5
authorwgw <tjm1100@gmail.com>
Sat, 29 Mar 2008 06:15:04 +0000 (29 01:15 -0500)
committerwgw <tjm1100@gmail.com>
Sat, 29 Mar 2008 06:15:04 +0000 (29 01:15 -0500)
tree121c35c49284660092a903408f65713e3f94145b
parentea48367f40a7f553d9b83f7574f60a59e017819c
parentc6a645091cb5a6fa5004393e3162b1fa3f0dd94b
Merge branch 'master' into beta-540
plugins/video/transcode.py