[goaccess/el6: 2/2] Merge branch 'master' into el6

[Christopher Meng]

commit dbbe3598bd4167fc9c96ecd08f03a76031e0d9a9
Merge: 469baf5 6e3e1cd
Author: Christopher Meng <i at cicku.me>
Date:   Wed May 21 09:33:24 2014 +0800

    Merge branch 'master' into el6

 .gitignore    |    1 +
 goaccess.spec |   13 ++++++++-----
 sources       |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---