From: Felix Dörre <felix@dogcraft.de>
Date: Tue, 5 Aug 2014 17:32:41 +0000 (+0200)
Subject: Merge branch 'SMIME'
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=44db0452c9f29cb97fd928b8e7684299c89ea844;hp=fd17f68ac74d7b0f3e7a1ede403ec773fc452509

Merge branch 'SMIME'
---