Merge branch 'develop' into debian/sid
authorAndrea Zagli <azagli@libero.it>
Mon, 25 Sep 2017 19:34:50 +0000 (21:34 +0200)
committerAndrea Zagli <azagli@libero.it>
Mon, 25 Sep 2017 19:34:50 +0000 (21:34 +0200)
commitc296a5c2fc3df501ec3652340a1f2a2d50d2c2eb
treeeb2cb00b99e76080aa51188538bd15be37f4eec7
parent77c914354f70dde5f292ff573fb3bb46ae35be3a
parent528f35ce8eb107ac6b95a004797d9bdea3219d26
Merge branch 'develop' into debian/sid