]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of ssh://git@git.videolan.org/vlc
authorJP Dinger <jpd@videolan.org>
Mon, 1 Feb 2010 00:57:41 +0000 (01:57 +0100)
committerJP Dinger <jpd@videolan.org>
Mon, 1 Feb 2010 00:57:41 +0000 (01:57 +0100)

Trivial merge