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

[Jan-Frode Myklebust]

commit 20499532fcc40db297be1cf2076e09424b17bf00
Merge: 7b1ac3c 7fbc9d8
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Wed Jul 16 11:02:32 2014 +0200

    Merge branch 'master' into epel7

 .gitignore            |    2 ++
 sources               |    4 ++--
 trafficserver.keyring |  Bin 21594 -> 31543 bytes
 trafficserver.spec    |   29 ++++++++++++++++-------------
 4 files changed, 20 insertions(+), 15 deletions(-)
---