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)
commit4eb13987d5ee2347fc6bd38e43967930cf5bd24b
tree9032d2716d777e0f49991cdcaf1c7a0b186aebcc
parentebabb68d75eaf0b3cd5c5572dc2fd0ea10d4d982
parentb3b2bf90c5105b987e02d264e87899f6502761d3
Merge remote branch 'origin/mika/iscserver'

Signed-off-by: Michael Gebetsroither <michael@mgeb.org>