]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git://git.videolan.org/vlc
authorGeoffroy Couprie <geo.couprie@gmail.com>
Tue, 30 Sep 2008 10:08:41 +0000 (12:08 +0200)
committerGeoffroy Couprie <geo.couprie@gmail.com>
Tue, 30 Sep 2008 10:08:41 +0000 (12:08 +0200)

Trivial merge