Merge branch 'develop' into debian/wheezy
authorAndrea Zagli <azagli@libero.it>
Sat, 24 Jun 2017 10:13:12 +0000 (12:13 +0200)
committerAndrea Zagli <azagli@libero.it>
Sat, 24 Jun 2017 10:13:12 +0000 (12:13 +0200)
commit747b494de3411c939fed5682b374dd67d832db3a
tree90d8ca63c14ef3b1ef29673d918dec58de583c33
parent8cd8f08759537a29515f98f3dfd3de576d6fcca6
parent3b52751cae67e545f6c0935e4ca6d45e06217d51
Merge branch 'develop' into debian/wheezy