]> git.piffa.net Git - sketchbook_andrea/commitdiff
Merge branch 'master' of kim:/home/git/sketchbook_andrea
authorAndrea Manni <andrea@piffa.net>
Mon, 15 Jun 2015 18:41:27 +0000 (20:41 +0200)
committerAndrea Manni <andrea@piffa.net>
Mon, 15 Jun 2015 18:41:27 +0000 (20:41 +0200)

Trivial merge