Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 7 Jul 2017 21:18:57 +0000 (23:18 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 7 Jul 2017 21:18:57 +0000 (23:18 +0200)
commitef31cd0ef00169f4fe0df361c54c817d89de4f75
treeae9412ca5b98b5105104c72fcf99a4648b8bf899
parent531a89e0a41838105121d1ded1ee87973e60587e
parent4e2fafb606f98f71aa404b9d0a55bc3b39f90418
Merge remote-tracking branch 'origin/master' into credentials