Merge branch 'develop' into debian/sid
authorAndrea Zagli <azagli@libero.it>
Wed, 27 Sep 2017 19:01:09 +0000 (21:01 +0200)
committerAndrea Zagli <azagli@libero.it>
Wed, 27 Sep 2017 19:01:09 +0000 (21:01 +0200)
commit9bda7a0050ca8517f208d15bcbe6a3f9d96d92d9
treef58b59531106ede6afc9c4cd1b57c85090aa1a3e
parentd19076e8b2c15a97d25e6b8948b3f33e962ac733
parentefa1f2cd54dfa351980358a15b472e14e082d1e7
Merge branch 'develop' into debian/sid
.gitignore