Code

Merge branch 'jr/varnish'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 13:45:52 +0000 (15:45 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 13:45:52 +0000 (15:45 +0200)
commit5be3e35ce9d291a1fd2f463ba4ae9a1e44e1249b
tree3eb406220dd919c821bd396fa8ff12d16d2c83be
parent72d9c1553333dc4d6102d2a2f55d81b2c1672a8d
parentf9dd7996a4956bd3320536999a39b4305c1ad002
Merge branch 'jr/varnish'