[lighttpd/el5: 13/13] Merge branch 'el6' into el5

[Jon Ciesla]

commit 5f19a3b53faca0c978c69c0aabd2dceee0cdc1d0
Merge: 97a8ad5 d9513b4
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Aug 26 08:18:38 2013 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	lighttpd-1.4.32-mod_geoip.patch

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