]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git://git.videolan.org/vlc
authorSteinar Gunderson <sgunderson@bigfoot.com>
Sat, 25 Sep 2010 22:45:43 +0000 (00:45 +0200)
committerSteinar Gunderson <sgunderson@bigfoot.com>
Sat, 25 Sep 2010 22:45:43 +0000 (00:45 +0200)

Trivial merge