From: eaman <eaman@pad.piffa.net>
Date: Tue, 21 Feb 2017 12:50:21 +0000 (+0100)
Subject: Merge branch 'master' of kim.andreamanni.com:/home/git/aerei
X-Git-Url: http://git.piffa.net/web?p=aerei;a=commitdiff_plain;h=d315b0e6605ab54b289eba4ea3c0672450aa196f

Merge branch 'master' of kim.andreamanni.com:/home/git/aerei
---

d315b0e6605ab54b289eba4ea3c0672450aa196f