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

[flo]

commit 9d6c12eaebf34ccd7ced896ce1bdb8610aa33c48
Merge: 0bcdd94 5064da9
Author: Lehner Florian <dev at der-flo.net>
Date:   Wed Sep 17 18:45:56 2014 +0200

    Merge branch 'master' into f21

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