From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 30 Apr 2014 13:02:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'ms/stunnel-addon'
X-Git-Tag: v2.15-rc2~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abe7ef8936adf7d3eb6ca232b25743200b096d2e;p=ipfire-2.x.git

Merge remote-tracking branch 'ms/stunnel-addon'
---

abe7ef8936adf7d3eb6ca232b25743200b096d2e