krb5_wrap: krb5_string_to_key / krb5_encrypt_block are deprecated.
[mat/samba.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.