Code

Merge branch 'ff/nginx'
authorFlorian Forster <octo@noris.net>
Tue, 23 Oct 2007 11:33:41 +0000 (13:33 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 23 Oct 2007 11:33:41 +0000 (13:33 +0200)
commit58ecdb7ff9a4d90e87daecca05b9cb4a43070fd7
tree73e8ab5d299aad1e0d980dd79b3da0ebcbbf7160
parent1695cd0763cb407e5606c27ce32c6054125fb560
parenta3e863a532edb3d75a4554ebb1ba6a44f9ab6e92
Merge branch 'ff/nginx'

Conflicts:

configure.in
src/Makefile.am
configure.in
src/Makefile.am