From: Felix Morgner <felix.morgner@gmail.com>
Date: Thu, 24 Apr 2014 12:17:32 +0000 (+0200)
Subject: Merge branch 'master' into gnutls
X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=f6d844d1999080359046790022dc820cb247cc23

Merge branch 'master' into gnutls
---

f6d844d1999080359046790022dc820cb247cc23