Merge branch 'sh-pidfile'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Oct 2006 16:32:58 +0000 (18:32 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Oct 2006 16:32:58 +0000 (18:32 +0200)
commit8fdec2467f3d4566185a9c9d757376aa3d30413b
tree052e6283bb8807eed639d5b022f8f68906ddb4d9
parentea44b73fd56bb1875d36f4bae02c463a0c611096
parent2bdfc256b1445ac61845e20d0bfd01a26e0b845d
Merge branch 'sh-pidfile'