]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git@git.videolan.org:vlc
authorDerk-Jan Hartman <hartman@videolan.org>
Mon, 21 Jul 2008 00:35:21 +0000 (02:35 +0200)
committerDerk-Jan Hartman <hartman@videolan.org>
Mon, 21 Jul 2008 00:35:21 +0000 (02:35 +0200)

Trivial merge