]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df823fd 6f01057)
Merge remote-tracking branch 'earl/telnet'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 2 Apr 2011 18:12:09 +0000 (20:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 2 Apr 2011 18:12:09 +0000 (20:12 +0200)

Trivial merge
IPFire 3.x development tree