]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git@git.videolan.org:vlc
authorJean-Baptiste Kempf <jb@videolan.org>
Fri, 24 Apr 2009 16:22:14 +0000 (18:22 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 24 Apr 2009 16:22:14 +0000 (18:22 +0200)

Trivial merge