]> eyrie.org Git - kerberos/krb5-strength.git/commit
Merge branch 'debian' into squeeze debian/squeeze debian/3.0-1_sbp60+1
authorRuss Allbery <eagle@eyrie.org>
Wed, 26 Mar 2014 22:04:03 +0000 (15:04 -0700)
committerRuss Allbery <eagle@eyrie.org>
Wed, 26 Mar 2014 22:08:14 +0000 (15:08 -0700)
commit1b0d13931ea9d4f9dd0fda75bdd719dbc5255a34
tree55b3ff5528978b7c1a3ad0b6b9402f989a865da3
parentfbb6f207f87df537570f410a2eaffde0f5921c4b
parent8eeae1d3db44f3d7fba0e8fa3f2d56097b99089e
Merge branch 'debian' into squeeze

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