Code

Merge branch 'master' into ag/apache
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 20 Apr 2009 18:41:55 +0000 (20:41 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 20 Apr 2009 18:41:55 +0000 (20:41 +0200)
commita3da854628383819439f0680acd2786fd00744fe
treee2e63fa891f54cdab34122a68601c537d6bd99e7
parent95d4cb4c0867e886fbe9e6e39596e84b5cb8dbd4
parent0d65234eb26bfe84b6457fd3b744f25ac8b947d6
Merge branch 'master' into ag/apache

Conflicts:
src/apache.c
src/apache.c