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)
commitf92f284f3a80e1f8fd87d2cc63288e1f1bbfeb9d
treed7bb9db591eedcaf8b9500c3659ac507f823feee
parent7e979cc57595d265f750ac2076a34a3565b1197d
parent6c66b3ecc23234fc5f5d98bcc7c54f66bfdeaab8
Merge branch 'tlsSelection'