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

[Robert Scheck]

commit 452c08e5457fec68a3ab6f0382bded427cb3c20b
Merge: b5179ee e253e8c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Jul 14 00:06:31 2012 +0200

    Merge remote branch 'origin/master' into el5

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