From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 21 Jun 2014 14:46:11 +0000 (+0200)
Subject: Merge branch 'tlsSelection'
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=f92f284f3a80e1f8fd87d2cc63288e1f1bbfeb9d

Merge branch 'tlsSelection'
---

f92f284f3a80e1f8fd87d2cc63288e1f1bbfeb9d