[lbzip2: 12/13] Merge branch 'epel7' into el6

[Mikolaj Izdebski]

commit aac59394a0dd4471d5a5dac2d61c4d24c94c5fb6
Merge: b3383df 83b7584
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Sun Jul 6 20:58:56 2014 +0200

    Merge branch 'epel7' into el6

 .gitignore  |    6 +-----
 lbzip2.spec |   50 ++++++++++++++++++++++++++++++++++++++++++--------
 sources     |    2 +-
 3 files changed, 44 insertions(+), 14 deletions(-)
---