diff options
| author | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
| commit | 1796d631f0846ec98cd286bc4284898a7300ee78 (patch) | |
| tree | 6fd42de6dc858ef06c6d270410c32ec61f39e593 /client/wallet-rekey.c | |
| parent | f5194217566a6f4cdeffbae551153feb1412210d (diff) | |
| parent | 6409733ee3b7b1910dc1c166a392cc628834146c (diff) | |
Merge tag 'upstream/1.1' into debian
Upstream version 1.1
Conflicts:
NEWS
README
client/keytab.c
perl/lib/Wallet/ACL.pm
perl/sql/Wallet-Schema-0.08-PostgreSQL.sql
perl/t/general/admin.t
perl/t/verifier/ldap-attr.t
Change-Id: I1a1dc09b97c9258e61f1c8877d0837193c8ae2c6
Diffstat (limited to 'client/wallet-rekey.c')
| -rw-r--r-- | client/wallet-rekey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/wallet-rekey.c b/client/wallet-rekey.c index 5007f41..95cd328 100644 --- a/client/wallet-rekey.c +++ b/client/wallet-rekey.c @@ -1,7 +1,7 @@ /* * A specialized wallet client for rekeying a keytab. * - * Written by Russ Allbery <rra@stanford.edu> + * Written by Russ Allbery <eagle@eyrie.org> * and Jon Robertson <jonrober@stanford.edu> * Copyright 2010 * The Board of Trustees of the Leland Stanford Junior University |