From: eaman <andrea@piffa.net>
Date: Tue, 10 Jan 2017 00:00:19 +0000 (+0100)
Subject: Thinkpad merge
X-Git-Url: http://git.piffa.net/web?a=commitdiff_plain;h=5162ccd992c6aa09b1b73da071991f0ef07779bc;p=sketchbook_andrea

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

5162ccd992c6aa09b1b73da071991f0ef07779bc