From: Sam Hartman <hartmans@painless-security.com>
Date: Mon, 3 Feb 2014 10:08:56 +0000 (-0500)
Subject: Merge branch 'moonshot-negotiate' of file:///srv/git/mod_auth_kerb
X-Git-Tag: gssweb-apache-2014-09-08~25
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mod_auth_kerb.git;a=commitdiff_plain;h=1e738db16856831652dedcf42e8d88eda90fa729

Merge branch 'moonshot-negotiate' of file:///srv/git/mod_auth_kerb
---

1e738db16856831652dedcf42e8d88eda90fa729