[vdr-skinsoppalusikka/f19: 2/2] Merge branch 'master' into f19

[Ville-Pekka Vainio]

commit 15bc3dd38f3c8855294883e768f8e8d3b5a24e61
Merge: 201318a 08a2b60
Author: Ville-Pekka Vainio <vpvainio at iki.fi>
Date:   Sun Jan 26 22:08:45 2014 +0200

    Merge branch 'master' into f19

 .gitignore                |    1 +
 sources                   |    2 +-
 vdr-skinsoppalusikka.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---