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

[Martin Gansser]

commit b0d70634ae7ee4a1da24b198682f9a5f687764b9
Merge: 86c78cb 615222b
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat May 10 20:47:47 2014 +0200

    Merge branch 'master' into f20

 vdr-epg-daemon.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---