projects / grml-terminalserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebabb68 b3b2bf9)
Merge remote branch 'origin/mika/iscserver'
authorMichael Gebetsroither <michael@mgeb.org>
Wed, 29 Sep 2010 16:20:54 +0000 (18:20 +0200)
committerMichael Gebetsroither <michael@mgeb.org>
Wed, 29 Sep 2010 16:20:57 +0000 (18:20 +0200)
Signed-off-by: Michael Gebetsroither <michael@mgeb.org>

Trivial merge
terminalserver for Grml