Merge branch 'master' of https://github.com/mrash/fwknop
authorMichael Rash <mbr@cipherdyne.org>
Sat, 11 Jan 2014 20:21:10 +0000 (15:21 -0500)
committerMichael Rash <mbr@cipherdyne.org>
Sat, 11 Jan 2014 20:21:10 +0000 (15:21 -0500)

Trivial merge