Merge remote-tracking branch 'upstream/master'
authorFerruccio Zamuner <nonsolosoft@diff.org>
Wed, 25 Oct 2017 10:00:31 +0000 (12:00 +0200)
committerFerruccio Zamuner <nonsolosoft@diff.org>
Wed, 25 Oct 2017 10:00:31 +0000 (12:00 +0200)
commitb2852f35f95e4d8c2627be170567d20df7da5e73
tree5366a058568bb1f1d91c02e3d11d4160871289b5
parente7ea7308eda320215bee203489fa654b09399acb
parentb62c4f8b4b612b159ff6e02e350a818f6c6ee5c3
Merge remote-tracking branch 'upstream/master'