Merge branch 'master' of github.com:mrash/fwknop
authorMichael Rash <mbr@cipherdyne.org>
Sat, 3 Nov 2012 23:00:56 +0000 (19:00 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Sat, 3 Nov 2012 23:00:56 +0000 (19:00 -0400)

Trivial merge