[pigz/el6: 4/5] Merge branch 'master' into el6

[Orion Poplawski]

commit 2ee04dc853e20cbdefeebffbfa69edf6ff7eed0e
Merge: 7cabf7a 784b22c
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon May 19 09:11:41 2014 -0600

    Merge branch 'master' into el6

 pigz-2.2.4-ldflags.patch |   12 ------------
 pigz.spec                |   18 ++++++++++++------
 sources                  |    2 +-
 3 files changed, 13 insertions(+), 19 deletions(-)
---