From: Felix Morgner <felix.morgner@gmail.com>
Date: Tue, 22 Apr 2014 09:16:20 +0000 (+0200)
Subject: Merge branch 'master' into gnutls
X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=ce0029a0c689d9b96d6a797a2e46aa0bee712e36

Merge branch 'master' into gnutls
---

ce0029a0c689d9b96d6a797a2e46aa0bee712e36