Merge branch 'master' of github.com:ag4ve/fwknop
authorShawn Wilson <swilson@korelogic.com>
Fri, 3 May 2013 16:28:49 +0000 (12:28 -0400)
committerShawn Wilson <swilson@korelogic.com>
Fri, 3 May 2013 16:28:49 +0000 (12:28 -0400)
Pull in forked upstream


Trivial merge