Merge branch 'master' of https://github.com/mrash/fwknop master
authorMichael Rash <mbr@cipherdyne.org>
Sat, 4 Oct 2014 14:38:08 +0000 (10:38 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Sat, 4 Oct 2014 14:38:08 +0000 (10:38 -0400)

Trivial merge