[pigz/el6: 3/3] Merge branch 'master' into el6 Update to 2.2.5

[Orion Poplawski]

commit 7cabf7a4db5a49d9d156f3889d2e026a375dfffb
Merge: 7f33dac a0f981b
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Aug 1 10:53:02 2012 -0600

    Merge branch 'master' into el6
    Update to 2.2.5

 .gitignore               |    4 +---
 pigz-2.2.4-ldflags.patch |   12 ++++++++++++
 pigz.spec                |   19 +++++++++++++++++--
 sources                  |    2 +-
 4 files changed, 31 insertions(+), 6 deletions(-)
---