projects / mech_eap.orig / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aed886e 464dbc6)
Merge remote-tracking branch 'origin/master' master
authorSam Hartman <hartmans@painless-security.com>
Tue, 3 Jan 2012 16:56:17 +0000 (11:56 -0500)
committerSam Hartman <hartmans@painless-security.com>
Tue, 3 Jan 2012 16:56:17 +0000 (11:56 -0500)

Trivial merge
Moonshot GSS-API mechanism