[lis/f21: 3/3] Merge branch 'master' into f21

[flo]

commit 31b600bb68359fead4bf1a4aea43ed71b0c0d05b
Merge: fecfc97 7887bf3
Author: Lehner Florian <dev at der-flo.net>
Date:   Thu Nov 27 19:38:11 2014 +0100

    Merge branch 'master' into f21

 .gitignore |    2 ++
 lis.spec   |    8 +++++++-
 sources    |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---