Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 30 May 2017 11:50:19 +0000 (13:50 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 30 May 2017 11:50:19 +0000 (13:50 +0200)
commitad5b64d8ef992d7281501297b547095569d8f0fb
tree275b487bd2cdf7ab03a5fe361bcf89bbd7bc42ca
parent5747257471e9b66208836799bced6df3d32c50f4
parentb612bb0dbc760cecdb64ad5cbd4ce65979971004
Merge remote-tracking branch 'origin/master' into credentials