Merge remote-tracking branch 'ummeegge/nmap' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 21:51:17 +0000 (22:51 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 21:51:17 +0000 (22:51 +0100)

Trivial merge