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

[Jussi Lehtola]

commit c64b18df2cbec8c86ecaf1eb3a2d30e171921e24
Merge: 29550c6 6430e48
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Jun 26 22:15:02 2012 +0300

    Merge branch 'master' into el6

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