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

[flo]

commit 3703014eaef8edda2b5c21a7b4c32beb2afa8ee7
Merge: fe79b9d 6f53f87
Author: Lehner Florian <dev at der-flo.net>
Date:   Tue Oct 28 19:23:30 2014 +0100

    Merge branch 'master' into f21

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