From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 2 Apr 2011 18:12:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'earl/telnet'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a7f9b4536acfcf8bfda145e2ff696c9b44a7a56;p=ipfire-3.x.git

Merge remote-tracking branch 'earl/telnet'
---

4a7f9b4536acfcf8bfda145e2ff696c9b44a7a56