Merge remote-tracking branch 'dweismueller/telnet' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Sep 2012 17:10:23 +0000 (19:10 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Sep 2012 17:10:23 +0000 (19:10 +0200)
commit26c8b40955b104d7d747d4a965f7ab4178dcae3b
tree306ae6cad83b2aa1865c062b29f3669031115766
parentee8e0346a167c4c1c78a1fef217196db838df8dd
parenteaaa6652ccfca472e413cd768ff170fa88637471
Merge remote-tracking branch 'dweismueller/telnet' into next

Conflicts:
make.sh
make.sh