From: pk910 <philipp@zoelle1.de>
Date: Mon, 12 Aug 2013 20:47:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.pk910.de:16110/ZNCAdmin
X-Git-Url: http://git.pk910.de/?p=ZNCAdmin.git;a=commitdiff_plain;h=fbde9a30ca3827c5089dc6a64c99028d7065581e

Merge branch 'master' of ssh://git.pk910.de:16110/ZNCAdmin
---

fbde9a30ca3827c5089dc6a64c99028d7065581e