]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git://git.videolan.org/vlc
authorSteinar Gunderson <sgunderson@bigfoot.com>
Sun, 26 Sep 2010 16:21:55 +0000 (18:21 +0200)
committerSteinar Gunderson <sgunderson@bigfoot.com>
Sun, 26 Sep 2010 16:21:55 +0000 (18:21 +0200)

Trivial merge