Merge branch 'master' of git@git.videolan.org:vlc
authorJP Dinger <jpd@videolan.org>
Fri, 24 Jul 2009 11:38:22 +0000 (13:38 +0200)
committerJP Dinger <jpd@videolan.org>
Fri, 24 Jul 2009 11:38:22 +0000 (13:38 +0200)
commitbf8d85d77b6fc8c47704a0b787aca8ee8d72bb47
tree48095e4a814b13e0b7b5f21793b838a36854a95c
parent8baae61a21c1ea12076df2987476c4fedb16bee8
parentaae7dd03aee5e222e3b0b218f7ce615096b07756
Merge branch 'master' of git@git.videolan.org:vlc