]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git@git.videolan.org:vlc
authorSam Hocevar <sam@zoy.org>
Thu, 20 Mar 2008 17:38:00 +0000 (17:38 +0000)
committerSam Hocevar <sam@zoy.org>
Thu, 20 Mar 2008 17:38:00 +0000 (17:38 +0000)

Trivial merge