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

[flo]

commit 8627cae714d6f13c0af8fe9473d0420c020774b9
Merge: c174c88 fa7ea23
Author: Lehner Florian <dev at der-flo.net>
Date:   Tue Nov 4 18:22:47 2014 +0100

    Merge branch 'master' into f21

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