]> eyrie.org Git - kerberos/krb5-strength.git/commit
Merge branch 'debian' into squeeze
authorRuss Allbery <eagle@eyrie.org>
Mon, 16 Dec 2013 23:56:24 +0000 (15:56 -0800)
committerRuss Allbery <eagle@eyrie.org>
Mon, 16 Dec 2013 23:56:24 +0000 (15:56 -0800)
commitfbb6f207f87df537570f410a2eaffde0f5921c4b
tree2939d9e232d11d5c01c0061863a8d3f65f5a277b
parentce8de9fcaec383e70081e6f12f2e334a3fc93df9
parente19fbd00a7a972f0cd1a4756ad0ba48188da1cf8
Merge branch 'debian' into squeeze

Conflicts:
debian/changelog
debian/control
debian/changelog
debian/control