Merge branch 'develop' into debian/wheezy
authorAndrea Zagli <azagli@libero.it>
Sun, 25 Jun 2017 09:52:04 +0000 (11:52 +0200)
committerAndrea Zagli <azagli@libero.it>
Sun, 25 Jun 2017 09:52:04 +0000 (11:52 +0200)
commitb593fd0bbd94f811e2c28fca0faf2b9ab1155766
tree520d478eb612288415c06f885bd2ab2236a08ce4
parentc15b1418e84d4069d5208e495b7d95e46a92e177
parentcea358a66da2035c74b3e3672ac6da6bc9b4e468
Merge branch 'develop' into debian/wheezy