]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Baptiste Kempf <jb@videolan.org>
Wed, 25 Jun 2008 19:49:51 +0000 (12:49 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 25 Jun 2008 19:49:51 +0000 (12:49 -0700)

Trivial merge