Merge branch 'master' into feature/hsts
authorDaniel Carl <danielcarl@gmx.de>
Mon, 28 Apr 2014 23:14:11 +0000 (01:14 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Mon, 28 Apr 2014 23:16:16 +0000 (01:16 +0200)
commit410474657f866a65a36d2ddc8f2e50a0cd09fad3
treef4e61d3e13f541404e5758f616af9f875a8b2e30
parent8ac9f1fb3d87e9bd356b845076804abe975ac56c
parent06383ae5e852e841d262fa6b42488c3b3d44e4f0
Merge branch 'master' into feature/hsts
config.mk
src/hsts.c
src/main.h
src/session.c