From: Attila Molnar <attilamolnar@hush.com>
Date: Fri, 19 Dec 2014 14:24:02 +0000 (+0100)
Subject: Merge branch 'master+flatmap'
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=c44433dad279aa8ad95fc936ce5d3c671fbf9aa3;p=user%2Fhenk%2Fcode%2Finspircd.git

Merge branch 'master+flatmap'
---

c44433dad279aa8ad95fc936ce5d3c671fbf9aa3