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

[flo]

commit dbb9f1544d10db98d7933665a2bec2c780a4294a
Merge: de3552e b69f7bc
Author: Lehner Florian <dev at der-flo.net>
Date:   Sat Dec 13 17:22:34 2014 +0100

    Merge branch 'master' into f21

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