From: Stefan Schantl <Stevee@ipfire.org>
Date: Fri, 25 Sep 2009 16:37:04 +0000 (+0200)
Subject: Merge branch 'jwhois'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=006ad24ad39e9cf8a7ed9be4efbcb52ef8e95985;p=ipfire-3.x.git

Merge branch 'jwhois'
---

006ad24ad39e9cf8a7ed9be4efbcb52ef8e95985