]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git.videolan.org:vlc
authorJean-Baptiste Kempf <jb@videolan.org>
Wed, 21 Jul 2010 16:16:32 +0000 (18:16 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 21 Jul 2010 16:16:32 +0000 (18:16 +0200)

Trivial merge