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

[Jon Ciesla]

commit b57e90a5aec0113d23a80f03a666520e39779c20
Merge: d9513b4 73b29dd
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Feb 5 10:34:24 2014 -0600

    Merge branch 'master' into el6

 .gitignore                      |    1 +
 lighttpd-1.4.34-mod_geoip.patch |  112 +++++++++++++++++++++++++++++++++++++++
 lighttpd.spec                   |   10 +++-
 sources                         |    2 +-
 4 files changed, 121 insertions(+), 4 deletions(-)
---