[tsung/epel7: 2/2] Merge branch 'master' into epel7

[Christopher Meng]

commit e511eec7935e477b1091d460b30c2606cfdc242b
Merge: 608f999 f224fec
Author: Christopher Meng <i at cicku.me>
Date:   Fri Jul 18 12:22:59 2014 +0800

    Merge branch 'master' into epel7

 tsung.spec |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)
---