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

[Martin Gansser]

commit 30a89efe9736177c485d6eaa664ce2d7b2ab85ff
Merge: 31582e4 fd2de5f
Author: Martin Gansser <mgansser at alice.de>
Date:   Thu May 15 18:08:32 2014 +0200

    Merge branch 'master' into f20

 .gitignore          |    1 +
 sources             |    2 +-
 vdr-epg-daemon.spec |    9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)
---