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

[Matthias Saou]

commit ddfaad7022d0ab6b766bc1104bb5b426e2ac9ea6
Merge: f811688 9359cb6
Author: Matthias Saou <thias at marmotte.net>
Date:   Tue Jul 12 18:35:27 2011 +0200

    Merge branch 'master' into el6

 .gitignore                                         |    4 +-
 lighttpd-1.4.23-defaultconf.patch                  |   59 -----
 lighttpd-1.4.23-ssl-2157.patch                     |   13 -
 lighttpd-1.4.28-defaultconf.patch                  |   32 +++
 ..._geoip.patch => lighttpd-1.4.29-mod_geoip.patch |   46 ++--
 lighttpd.service                                   |   13 +
 lighttpd.spec                                      |  248 +++++++++++++++-----
 sources                                            |    3 +-
 8 files changed, 262 insertions(+), 156 deletions(-)
---