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

[Martin Gansser]

commit 86c78cb12fab60f467a2705ff4b7d09aef17b366
Merge: 6645d02 14f6134
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat May 10 20:02:48 2014 +0200

    Merge branch 'master' into f20

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