Merge remote-tracking branch 'leap/feature/refresh_stunnels'
authorvarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 18:31:22 +0000 (20:31 +0200)
committervarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 18:31:22 +0000 (20:31 +0200)
commita4b8195e7a5d444448b3750d66ec725d6f7c67ab
treec6c00ece73c7ddb9813869e2b10b6a862e26c035
parent8a54ee6ff08c7b498e8da8f5e8ca6827c4d0ff58
parenta336f39c441b7b3706278332cc63782d2de0e299
Merge remote-tracking branch 'leap/feature/refresh_stunnels'