]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git@git.videolan.org:vlc
authorAndré Weber <WeberAndre@gmx.de>
Sun, 2 Mar 2008 17:37:32 +0000 (18:37 +0100)
committerAndré Weber <WeberAndre@gmx.de>
Sun, 2 Mar 2008 17:37:32 +0000 (18:37 +0100)

Trivial merge