Merge remote branch 'jeromer/master' into jr/varnish
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 13:35:27 +0000 (15:35 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 13:35:27 +0000 (15:35 +0200)
commit019f71b91cdbe9f84438404bdb6a207ae859becd
treeeb8d9d454fe8fc4c0bf17ff9e5b89c6aa06741d9
parent7cfb6b8c6a470054c6661b81511a48365b6598d8
parent1dae7129012756983600f99f7941f74350c66675
Merge remote branch 'jeromer/master' into jr/varnish
src/varnish.c