]> eyrie.org Git - kerberos/krb5-strength.git/commit
Merge branch 'debian' into squeeze
authorRuss Allbery <eagle@eyrie.org>
Tue, 5 Nov 2013 20:00:30 +0000 (12:00 -0800)
committerRuss Allbery <eagle@eyrie.org>
Tue, 5 Nov 2013 20:00:30 +0000 (12:00 -0800)
commitce8de9fcaec383e70081e6f12f2e334a3fc93df9
treec40c31b9ca977463910ea275a6adb369aba1bc34
parent4818754c69179680d99471ab15f78f989498bbb5
parent6a9377879a2d9c89d4401733e4aa5dedd91e5540
Merge branch 'debian' into squeeze

Conflicts:
debian/changelog
debian/changelog