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

[flo]

commit de3552efa179b266e80b358b234eb32533789221
Merge: 86e8b2c 92e13a7
Author: Lehner Florian <dev at der-flo.net>
Date:   Sun Dec 7 22:55:45 2014 +0100

    Merge branch 'master' into f21

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