Merge branch 'master' into subfolders-8.3
commitf119c965fdada55f12312fd1eed9e5dbc4f32b49
authorJason Michalski <armooo@armooo.net>
Mon, 3 Dec 2007 03:08:49 +0000 (2 21:08 -0600)
committerJason Michalski <armooo@armooo.net>
Mon, 3 Dec 2007 03:08:49 +0000 (2 21:08 -0600)
treebc0c22c6f134f5fbbeccd0e34ff59a9a6cc94493
parent10bf9e4e15a51c6a758fabefb75f6502b7809e09
parente0d9839dbdb9b608c2ea90c31a946c526c44b5d5
Merge branch 'master' into subfolders-8.3

Conflicts:

httpserver.py
httpserver.py
plugins/video/video.py