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

[Matthias Saou]

commit 4343e7f4ad90ea3592dd0e04bda31aa1b84fed94
Merge: a6952cf 1c3f709
Author: Matthias Saou <matthias at saou.eu>
Date:   Mon Mar 26 17:19:25 2012 +0200

    Merge branch 'master' into el5

 .gitignore                                         |    1 +
 ..._geoip.patch => lighttpd-1.4.30-mod_geoip.patch |   30 ++--
 lighttpd.spec                                      |  159 +++++++++++---------
 sources                                            |    3 +-
 4 files changed, 103 insertions(+), 90 deletions(-)
---