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

[Martin Gansser]

commit 31582e45384e46c1360fcc941699b62030bac065
Merge: 1a1f5e0 7f06d06
Author: Martin Gansser <mgansser at alice.de>
Date:   Wed May 14 19:22:29 2014 +0200

    Merge branch 'master' into f20

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