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

[Christopher Meng]

commit 4472613c03f5638f91dd9b03b4f680bdbd58e290
Merge: 2bced34 cef3d0b
Author: Christopher Meng <i at cicku.me>
Date:   Wed Jun 18 20:46:28 2014 +0800

    Merge branch 'master' into el6

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