Merge remote-tracking branch 'ms/stunnel-addon'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Apr 2014 13:02:51 +0000 (15:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Apr 2014 13:02:51 +0000 (15:02 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge