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

[flo]

commit a633857e4fe2a1dd6b243dfe1dada5d73fad28f5
Merge: da06a52 486bec8
Author: Lehner Florian <dev at der-flo.net>
Date:   Tue Oct 21 17:15:28 2014 +0200

    Merge branch 'master' into f21

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