Merge branch 'fix/hsts'.
authorDaniel Carl <danielcarl@gmx.de>
Wed, 26 Nov 2014 12:25:40 +0000 (13:25 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Wed, 26 Nov 2014 12:25:40 +0000 (13:25 +0100)
1  2 
src/main.c

diff --cc src/main.c
Simple merge