Merge branch 'master' of github.com:mrash/fwknop
authorMichael Rash <mbr@cipherdyne.org>
Sat, 8 Dec 2012 21:26:30 +0000 (16:26 -0500)
committerMichael Rash <mbr@cipherdyne.org>
Sat, 8 Dec 2012 21:26:30 +0000 (16:26 -0500)

Trivial merge