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)

Trivial merge