| commit | dfba8689103ed990efbc50fda608561b9ef895da | |
| author | Luke Howard <lukeh@padl.com> | |
| Sat, 14 May 2011 14:48:49 +0000 (14 16:48 +0200) | ||
| committer | Luke Howard <lukeh@padl.com> | |
| Sat, 14 May 2011 14:48:49 +0000 (14 16:48 +0200) | ||
| tree | 3665fabc147873ae3534862a4b6c1039895e3aac | treesnapshot (tar.gz zip) |
| parent | 3069d80734aaedad61c719d4ad0b8d71ea236e35 | commitdiff |
| parent | 2a8dc252b61ed34cc07844a445f6487bea88f265 | commitdiff |
Merge branch 'master' into lukeh/acquire-cred-ex-moonshot-integ
Conflicts:
lib/gssapi/Makefile.am
lib/gssapi/mech/gss_acquire_cred_with_password.c
lib/gssapi/test_context.c
lib/gssapi/version-script.map
Conflicts:
lib/gssapi/Makefile.am
lib/gssapi/mech/gss_acquire_cred_with_password.c
lib/gssapi/test_context.c
lib/gssapi/version-script.map