[lis/f21: 2/4] Merge branch 'master' into f21

[flo]

commit fe79b9d842740b2ca764c928acce836ec2be36ec
Merge: a633857 8e2a46b
Author: Lehner Florian <dev at der-flo.net>
Date:   Mon Oct 27 20:36:04 2014 +0100

    Merge branch 'master' into f21

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