Merge branch 'tlsSelection'
authorFelix Dörre <felix@dogcraft.de>
Sat, 21 Jun 2014 14:46:11 +0000 (16:46 +0200)
committerFelix Dörre <felix@dogcraft.de>
Sat, 21 Jun 2014 14:46:11 +0000 (16:46 +0200)

Trivial merge