From: Christopher Zorn <christopher@mochimedia.com>
Date: Wed, 4 May 2011 16:45:13 +0000 (-0700)
Subject: Merge branch 'pull_request_5'
X-Git-Url: http://git.arpa2.org/?a=commitdiff_plain;h=9f3328fe1abb7cf5487f8357d7ffff06143dc109;p=punjab-krb5-preauth

Merge branch 'pull_request_5'
---

9f3328fe1abb7cf5487f8357d7ffff06143dc109