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

[Jussi Lehtola]

commit 43fd7c412e9f75a1ae261c4e4985c3ec31dcf386
Merge: 90bf99f 6430e48
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Jun 26 22:14:08 2012 +0300

    Merge branch 'master' into el5

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