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

[Martin Gansser]

commit 1a1f5e0c0fb1ff56332426224851f9ecf57a01f1
Merge: 4e602c0 7b92126
Author: Martin Gansser <mgansser at alice.de>
Date:   Tue May 13 20:45:53 2014 +0200

    Merge branch 'master' into f20

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