Merge branch 'master' of gitorious.org:http-daemon/mainline master
authorMartin Berends <mberends@autoexec.demon.nl>
Tue, 13 Jul 2010 18:37:52 +0000 (19:37 +0100)
committerMartin Berends <mberends@autoexec.demon.nl>
Tue, 13 Jul 2010 18:37:52 +0000 (19:37 +0100)
commit26ad703ea6fc3ec540fdfa0654cfa045abbd741a
tree72c1eb62dfae37a754ba5e9db3d3cb3925c9737a
parent8861b709b90c4f0562658769ce42994ad94d8901
parentd983140451c442be4869f89606ff6b563611aa6e
Merge branch 'master' of gitorious.org:http-daemon/mainline
bin/httpd