]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git://git.videolan.org/vlc
authorSteinar Gunderson <sgunderson@bigfoot.com>
Fri, 24 Sep 2010 13:15:50 +0000 (15:15 +0200)
committerSteinar Gunderson <sgunderson@bigfoot.com>
Fri, 24 Sep 2010 13:15:50 +0000 (15:15 +0200)

Trivial merge