Merge branch 'master' of kim:/home/git/sketchbook_andrea
authorAndrea Manni <andrea@piffa.net>
Mon, 13 Mar 2017 11:13:24 +0000 (12:13 +0100)
committerAndrea Manni <andrea@piffa.net>
Mon, 13 Mar 2017 11:13:24 +0000 (12:13 +0100)

Trivial merge