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

[Susi Lehtola]

commit 1ac9f745b3eae7e612e54af535a5b6b7d538daf0
Merge: 09a65cd d21f9c6
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Mon Mar 4 14:17:00 2013 +0200

    Merge branch 'master' into el6

 lis-1.3.31-amgc.patch |   14 ++++++++++++++
 lis.spec              |   11 ++++++++++-
 sources               |    2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)
---