]> git.sesse.net Git - vlc/commitdiff
Merge branch 'df-for-upstream' of git://repo.or.cz/vlc/davidf-public
authorDerk-Jan Hartman <hartman@videolan.org>
Thu, 31 Jul 2008 22:41:33 +0000 (00:41 +0200)
committerDerk-Jan Hartman <hartman@videolan.org>
Thu, 31 Jul 2008 22:41:33 +0000 (00:41 +0200)

Trivial merge