]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git@git.videolan.org:vlc
authorJP Dinger <jpd@videolan.org>
Fri, 24 Jul 2009 15:24:46 +0000 (17:24 +0200)
committerJP Dinger <jpd@videolan.org>
Fri, 24 Jul 2009 15:24:46 +0000 (17:24 +0200)

Trivial merge