Merge branch 'master' of ssh://github.com/mrash/fwknop master
authorMichael Rash <mbr@cipherdyne.org>
Wed, 27 Aug 2014 03:23:31 +0000 (23:23 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Wed, 27 Aug 2014 03:23:31 +0000 (23:23 -0400)

Trivial merge