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

[Eduardo Javier Echeverria Alvarado]

commit 81eab25fb2b92518bb112a3106911a8fa6a0db2d
Merge: c1e147d f8f364e
Author: Eduardo Echeverria <echevemaster at gmail.com>
Date:   Fri Dec 5 01:34:38 2014 -0430

    Merge branch 'master' into f20

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