[trafficserver/epel7: 3/3] Merge branch 'master' into epel7

[Jan-Frode Myklebust]

commit 7b1ac3ca60f3ddf1e7c47865e043ebded60478e7
Merge: 56d3d5e 12bfd3b
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Wed Apr 30 22:29:31 2014 +0200

    Merge branch 'master' into epel7

 trafficserver.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---