]> git.sesse.net Git - vlc/commitdiff
Merge branch 'master' of git@git.videolan.org:vlc
authorIlkka Ollakka <ileoo@videolan.org>
Thu, 26 Jun 2008 07:38:53 +0000 (10:38 +0300)
committerIlkka Ollakka <ileoo@videolan.org>
Thu, 26 Jun 2008 07:38:53 +0000 (10:38 +0300)

Trivial merge