Merge branch 'moonshot-negotiate' of file:///srv/git/mod_auth_kerb
authorSam Hartman <hartmans@painless-security.com>
Mon, 3 Feb 2014 10:08:56 +0000 (05:08 -0500)
committerSam Hartman <hartmans@painless-security.com>
Mon, 3 Feb 2014 10:08:56 +0000 (05:08 -0500)

Trivial merge