]> eyrie.org Git - kerberos/krb5-strength.git/commitdiff
Merge tag 'upstream/2.2' into debian
authorRuss Allbery <eagle@eyrie.org>
Mon, 16 Dec 2013 21:50:16 +0000 (13:50 -0800)
committerRuss Allbery <eagle@eyrie.org>
Mon, 16 Dec 2013 21:50:16 +0000 (13:50 -0800)
Upstream version 2.2


Trivial merge