[xine-lib/f15: 4/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/xine-lib into f15

[Kevin Kofler]

commit 25a19e7a5f763231c327e522dce50d36eb6908cb
Merge: e18cbe6 4a6eed5
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Jan 4 22:34:52 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/xine-lib into f15

 .gitignore                            |    1 +
 sources                               |    2 +-
 xine-lib-1.1.20-link-libdvdread.patch |   11 -----------
 xine-lib.spec                         |   10 +++++-----
 4 files changed, 7 insertions(+), 17 deletions(-)
---