[lrzip/el6: 3/3] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 8918819eafc6464cbbcd16281accdb88de702657
Merge: b5179ee e253e8c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Jul 14 00:05:54 2012 +0200

    Merge remote branch 'origin/master' into el6

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