| commit | 9053e8625455d11b268a6f6b090b7efd4a2980ab | |
| author | Luke Howard <lukeh@padl.com> | |
| Mon, 21 Mar 2011 12:55:54 +0000 (21 23:55 +1100) | ||
| committer | Luke Howard <lukeh@padl.com> | |
| Mon, 21 Mar 2011 12:55:54 +0000 (21 23:55 +1100) | ||
| tree | 8e6f9553a6fe70f86fbdab8c9a31d22b63e7cf22 | treesnapshot (tar.gz zip) |
| parent | d116a78297a06fb865ae95d5496ae2c4de60f971 | commitdiff |
| parent | da70ba0e8d8191cd6dab4c4313f359b433aeafe3 | commitdiff |
Merge branch 'lukeh/moonshot' of github.com:heimdal/heimdal into lukeh/moonshot
Conflicts:
lib/gssapi/version-script.map
Conflicts:
lib/gssapi/version-script.map