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

[Jon Ciesla]

commit d9513b47d3348e26ea733ca0fc6baa173d8c4a31
Merge: f493a74 75b3eac
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Aug 26 08:16:50 2013 -0500

    Merge branch 'master' into el6

 .gitignore                      |    1 +
 lighttpd-1.4.32-mod_geoip.patch |  110 +++++++++++++++++++++++++++++++++++++++
 lighttpd.spec                   |   16 +++++-
 sources                         |    2 +-
 4 files changed, 126 insertions(+), 3 deletions(-)
---