![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@noris.net> | |
| Tue, 23 Oct 2007 11:33:41 +0000 (13:33 +0200) | ||
| committer | Florian Forster <octo@noris.net> | |
| Tue, 23 Oct 2007 11:33:41 +0000 (13:33 +0200) | ||
| commit | 58ecdb7ff9a4d90e87daecca05b9cb4a43070fd7 | |
| tree | 73e8ab5d299aad1e0d980dd79b3da0ebcbbf7160 | tree | snapshot |
| parent | 1695cd0763cb407e5606c27ce32c6054125fb560 | commit | diff |
| parent | a3e863a532edb3d75a4554ebb1ba6a44f9ab6e92 | commit | diff |
Merge branch 'ff/nginx'
Conflicts:
configure.in
src/Makefile.am
Conflicts:
configure.in
src/Makefile.am
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |