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

[Jan-Frode Myklebust]

commit 0cadd05338bc67eee44e08dd8055a8efb89c4511
Merge: f2d8163 3a861d3
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Sat Apr 26 00:33:23 2014 +0200

    Merge branch 'master' into epel7

 .gitignore            |    4 ++++
 sources               |    4 ++--
 trafficserver.keyring |  Bin 19298 -> 21594 bytes
 trafficserver.spec    |   12 +++++++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)
---