Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 18 May 2017 11:13:09 +0000 (13:13 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 18 May 2017 11:13:09 +0000 (13:13 +0200)
commitecb0ab123eca06cf982d388e69d1c6ddca3f9672
treec3e933a99187332868ea9f5befd9849bce4b9f57
parent315cdad26814aa1d5e35ee7c75cfa32058a04bf2
parent696ca66c291f84d7bdbc7a043c6156d2b9de0607
Merge remote-tracking branch 'origin/master' into credentials