diff options
| author |   Eric Faurot <eric@faurot.net> | 2012-12-28 10:31:54 +0100 |
|---|---|---|
| committer | Eric Faurot <eric@faurot.net> | 2012-12-28 10:31:54 +0100 |
| commit | dffe9c634dc97a81587c9513e3599146dcfb9636 (patch) | |
| tree | 86c71109529aa5a5796ff6101b076e5bcf6a1d16 /smtpd/delivery_filename.c | |
| parent | Merge branch 'portable' of ssh://ssh.poolp.org/git/opensmtpd into portable (diff) | |
| parent | update my mail address and add myself to some files where I should own copyright (diff) | |
| download | OpenSMTPD-dffe9c634dc97a81587c9513e3599146dcfb9636.tar.xz OpenSMTPD-dffe9c634dc97a81587c9513e3599146dcfb9636.zip | |
Merge branch 'master' into portable
Conflicts:
smtpd/ssl.c
Diffstat (limited to 'smtpd/delivery_filename.c')
| -rw-r--r-- | smtpd/delivery_filename.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/smtpd/delivery_filename.c b/smtpd/delivery_filename.c index e77e4377..6095573c 100644 --- a/smtpd/delivery_filename.c +++ b/smtpd/delivery_filename.c @@ -1,7 +1,7 @@ /* $OpenBSD: delivery_filename.c,v 1.6 2012/10/03 17:58:03 gilles Exp $ */ /* - * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> + * Copyright (c) 2011 Gilles Chehade <gilles@poolp.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above |