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

[Martin Gansser]

commit 4e602c0f70ae7eb2676c0d21c4f4c758ba60ee94
Merge: b0d7063 3411136
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat May 10 23:28:17 2014 +0200

    Merge branch 'master' into f20

 .gitignore                    |    1 +
 sources                       |    1 +
 vdr-epg-daemon-makefile.patch |   12 ++++++------
 vdr-epg-daemon.spec           |    6 ++++++
 4 files changed, 14 insertions(+), 6 deletions(-)
---