From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 8 Oct 2015 21:58:43 +0000 (+0200)
Subject: Merge pull request #146 from benapetr/master
X-Git-Tag: travis-deploy-test~552
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d6dd4ff24cade95ed49570786c8b81f10c6bddce

Merge pull request #146 from benapetr/master

Clean up
---

d6dd4ff24cade95ed49570786c8b81f10c6bddce