Merge commit 'upstream/0.12' into debian

1 files changed, 3 insertions, 5 deletions

diff --git a/README b/README
index 4879f97..5eae7fd 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-                           wallet release 0.11
+                           wallet release 0.12
                      (secure data management system)
 
                 Written by Russ Allbery <rra@stanford.edu>
@@ -8,9 +8,6 @@
   license.  Please see the file LICENSE in the distribution for more
   information.
 
-  This software is beta-quality and should be treated with caution.  It is
-  currently being tested for production deployment at Stanford.
-
 BLURB
 
   The wallet is a system for managing secure data, authorization rules to
@@ -275,4 +272,5 @@ THANKS
   security models.
 
   To Jon Robertson for the refactoring of Wallet::Kadmin, Heimdal support,
-  and many of the wallet server-side reports.
+  many of the wallet server-side reports, and the initial wallet-rekey
+  implementation.