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

[flo]

commit da06a521e64bfe67c25f8e05636354d04a7b0010
Merge: f11c07f c93cd6e
Author: Lehner Florian <dev at der-flo.net>
Date:   Mon Oct 20 19:33:39 2014 +0200

    Merge branch 'master' into f21

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