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

[flo]

commit 820906d1d9100ccc87faa3055fbb9eaf0cc0c30c
Merge: 3b1d06b 0c0984b
Author: Lehner Florian <dev at der-flo.net>
Date:   Wed Aug 27 18:43:58 2014 +0200

    Merge branch 'master' into f21

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