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

[Susi Lehtola]

commit 086896bb46e61a3e568d467882b47102795bbab2
Merge: 1ac9f74 e982910
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Mon Mar 4 15:19:21 2013 +0200

    Merge branch 'master' into el6

 .gitignore            |    1 +
 lis-1.3.31-amgc.patch |   14 --------------
 lis.spec              |   10 ++++------
 sources               |    2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)
---