]> eyrie.org Git - kerberos/heimdal-kadm5.git/commit
Merge branch 'upstream' into debian
authorRuss Allbery <rra@stanford.edu>
Sat, 3 Apr 2010 00:50:21 +0000 (17:50 -0700)
committerRuss Allbery <rra@stanford.edu>
Sat, 3 Apr 2010 00:50:21 +0000 (17:50 -0700)
commit12fdf768a2b9961fe4606426a3ac7036c69ff13e
treea67833644ade6e69b931d0398d0865192dd18955
parentf000e83d15d7ae665ed7f6d56bc21ac29634c4c1
parent000ffee0159b4fec5ad9754edca0935301428b26
Merge branch 'upstream' into debian