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)
commitbd923843eb7e8e39a862d2952fea96c23a807254
treef7de993899e1a328e99252d6e28ee790c6f9f730
parentea46e52e0091feb138b2f1c8a205df066539fcf1
parentf36b66bef770027b651366e128158b4b79cd10a8
Merge branch 'fix/hsts'.
src/main.c