From: eaman <andrea@piffa.net>
Date: Fri, 23 Sep 2016 14:22:42 +0000 (+0200)
Subject: Merge branch 'master' of kim:/home/git/sketchbook_andrea
X-Git-Url: http://git.piffa.net/web?a=commitdiff_plain;h=5d07061594da4a1922d381c1c0a531f1a342103d;p=sketchbook_andrea

Merge branch 'master' of kim:/home/git/sketchbook_andrea
---

5d07061594da4a1922d381c1c0a531f1a342103d