Merge branch 'master' of github.com:mrash/fwknop
authorMichael Rash <mbr@cipherdyne.org>
Wed, 18 Jul 2012 02:20:36 +0000 (22:20 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Wed, 18 Jul 2012 02:20:36 +0000 (22:20 -0400)

Trivial merge