Merge branch 'master' of github.com:fmorgner/umurmur

author Felix Morgner <felix.morgner@gmail.com>

Tue, 22 Sep 2015 00:28:44 +0000 (17:28 -0700)

committer Felix Morgner <felix.morgner@gmail.com>

Tue, 22 Sep 2015 00:28:44 +0000 (17:28 -0700)
author Felix Morgner <felix.morgner@gmail.com>
Tue, 22 Sep 2015 00:28:44 +0000 (17:28 -0700)
committer Felix Morgner <felix.morgner@gmail.com>
Tue, 22 Sep 2015 00:28:44 +0000 (17:28 -0700)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/ssli_openssl.c
Simple merge
author	Felix Morgner <felix.morgner@gmail.com>
	Tue, 22 Sep 2015 00:28:44 +0000 (17:28 -0700)
committer	Felix Morgner <felix.morgner@gmail.com>
	Tue, 22 Sep 2015 00:28:44 +0000 (17:28 -0700)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/ssli_openssl.c	patch \|	diff1 \|	diff2 \|	blob \| history