Merge branch 'feature/hsts'
authorDaniel Carl <danielcarl@gmx.de>
Wed, 28 May 2014 08:22:52 +0000 (10:22 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Wed, 28 May 2014 08:24:42 +0000 (10:24 +0200)
commita1d9090cefe78c24bab810d950978f248fc39b88
treeb20839f931d3cb69e05acde1b05f4e29d2b25ccc
parented93b58e30d924352a054bdf69b73bc9397305d8
parentf9f66df79faf85062eb575f6087a8dca87aa6b8a
Merge branch 'feature/hsts'

Conflicts:
config.mk
README.md
config.mk
src/main.c