From: pk910 <philipp@zoelle1.de>
Date: Sat, 29 Jun 2013 23:17:49 +0000 (+0200)
Subject: Merge branch 'MixedVersions'
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;ds=sidebyside;h=3aa922ffd39f11a8dff55ccd09c00af9228b6bf0;p=ZNCAdmin.git

Merge branch 'MixedVersions'
---

3aa922ffd39f11a8dff55ccd09c00af9228b6bf0