[vdr-scraper2vdr/f21: 2/2] Merge branch 'master' into f21

[Martin Gansser]

commit 91247a4533e7bd2e09b23e996fb2c2f72882a18a
Merge: b8aabf4 4560bc2
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat Oct 25 09:33:21 2014 +0200

    Merge branch 'master' into f21

 .gitignore           |    1 +
 sources              |    2 +-
 vdr-scraper2vdr.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---