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

[Martin Gansser]

commit beb0fff7ad061bd89dfcd97def50438270c4087f
Merge: 8d53d0d 4560bc2
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat Oct 25 09:47:48 2014 +0200

    Merge branch 'master' into f20

 .gitignore           |    1 +
 sources              |    2 +-
 vdr-scraper2vdr.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index da5efaa,a2914e2..4f4f488
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,8 +1,3 @@@
 -/vdr-plugin-scraper2vdr-30008b3000e6421e6a54d0dc43a2e952e6a6617d.tar.bz2
 -/vdr-plugin-scraper2vdr-ea862b36b21029890a1a137f06ba3d828c36d372.tar.bz2
 -/scraper2vdr-smpbuildfix.patch
 -/vdr-plugin-scraper2vdr-7231362092882b007ca3b3fa8f7dd941f08bbeb8.tar.bz2
 -/vdr-scraper2vdr-0.1.3.tgz
  /vdr-plugin-scraper2vdr-2bfb7c7ce2e0aadfdb0ae0d8a8a5a50074fcb416.tar.bz2
  /vdr-scraper2vdr-0.1.4.tgz
+ /vdr-scraper2vdr-0.1.5.tgz