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

[flo]

commit fecfc9709aa544f27f95d67ca778a4b0d0ab1029
Merge: f5efd1f b781897
Author: Lehner Florian <dev at der-flo.net>
Date:   Tue Nov 25 18:55:40 2014 +0100

    Merge branch 'master' into f21

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