Merge branch 'master' into krkeegan
commitfb7ddae5910eef07792bc05ed1ac2c39aff6a770
authorWilliam McBrine <wmcbrine@gmail.com>
Thu, 10 Jan 2008 22:47:13 +0000 (10 17:47 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Thu, 10 Jan 2008 22:47:13 +0000 (10 17:47 -0500)
tree0351e6e92dd1b1af923e5f050bdd13287e0b2aaf
parent9e1dedc3233bae5f3853bc4c8710691422976108
parent3ad40a4ba3804591f901187cebe8ecbafeb0d092
Merge branch 'master' into krkeegan
config.py
plugins/video/transcode.py
plugins/video/video.py