Merge branch 'sh/email'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 21 Dec 2006 20:12:24 +0000 (21:12 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 21 Dec 2006 20:12:24 +0000 (21:12 +0100)
commit1b27073f0046bbbe7e84c0a3c79ca3bde8c800df
tree8a4d1ea56fce42b0fa164394896d87ef49850ba4
parente913f3f6b71b0ba4abd6aaf2202100a5cef48b75
parent2403dd00be7ee359a1da567ec1a3d1dddf179a58
Merge branch 'sh/email'