From: Felix Dörre <felix@dogcraft.de>
Date: Tue, 12 Aug 2014 22:45:38 +0000 (+0200)
Subject: Merge branch 'csrParse'
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=3a82aeb3af3e15430268cc1aeb57de66f3dd9b29

Merge branch 'csrParse'
---

3a82aeb3af3e15430268cc1aeb57de66f3dd9b29