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

[Matthias Saou]

commit 97a8ad575a7af55d80685d231da8cc0d36715c36
Merge: 4343e7f 4667c4c
Author: Matthias Saou <matthias at saou.eu>
Date:   Wed Jun 6 15:37:41 2012 +0200

    Merge branch 'master' into el5

 .gitignore                                         |    1 +
 ..._geoip.patch => lighttpd-1.4.31-mod_geoip.patch |   48 ++++++++++----------
 lighttpd.service                                   |    3 +-
 lighttpd.spec                                      |   10 +++-
 sources                                            |    2 +-
 5 files changed, 35 insertions(+), 29 deletions(-)
---