[tcpreplay/el6: 8/8] Merge branch 'master' into el6

[bojan]

commit 02d9ffeee697d2a43c9be40d8bb378d5d0c31cf6
Merge: 0a732af 84d383a
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Fri Dec 19 13:43:08 2014 +1100

    Merge branch 'master' into el6

 .gitignore     |    2 ++
 sources        |    2 +-
 tcpreplay.spec |   18 +++++++++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)
---