Merge branch 'master' into KeepConn
authorpk910 <philipp@zoelle1.de>
Fri, 11 May 2012 03:36:12 +0000 (05:36 +0200)
committerpk910 <philipp@zoelle1.de>
Fri, 11 May 2012 03:36:12 +0000 (05:36 +0200)

Trivial merge