From: pk910 <philipp@zoelle1.de>
Date: Fri, 11 May 2012 03:36:12 +0000 (+0200)
Subject: Merge branch 'master' into KeepConn
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=805ef5ce48ebeb5a5c9f7766a3840964f58001fb;hp=805ef5ce48ebeb5a5c9f7766a3840964f58001fb;p=ircu2.10.12-pk.git

Merge branch 'master' into KeepConn
---