Merge branch 'master' of github.com:umurmur/umurmur
authorFelix Morgner <felix.morgner@gmail.com>
Tue, 10 Feb 2015 18:46:04 +0000 (19:46 +0100)
committerFelix Morgner <felix.morgner@gmail.com>
Tue, 10 Feb 2015 18:46:04 +0000 (19:46 +0100)

Trivial merge