]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git://git.videolan.org/vlc
authorSteinar H. Gunderson <steinar+vlc@gunderson.no>
Wed, 29 Sep 2010 23:39:51 +0000 (01:39 +0200)
committerSteinar H. Gunderson <steinar+vlc@gunderson.no>
Wed, 29 Sep 2010 23:39:51 +0000 (01:39 +0200)

Trivial merge