From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Oct 2012 12:18:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'ummeegge/nmap-update'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8a8cf219c0daf68ef78a0936e045cb5663df978;p=ipfire-3.x.git

Merge remote-tracking branch 'ummeegge/nmap-update'
---

e8a8cf219c0daf68ef78a0936e045cb5663df978