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

[Matthias Saou]

commit 8979204d97841bed8f10bf79995271277773e3e6
Merge: ddfaad7 1c3f709
Author: Matthias Saou <matthias at saou.eu>
Date:   Mon Mar 26 16:47:50 2012 +0200

    Merge branch 'master' into el6

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