Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 27 Dec 2016 15:43:48 +0000 (16:43 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 27 Dec 2016 15:43:48 +0000 (16:43 +0100)
commit43b34377e10d329075327104e4a295ee9d3c53b4
tree29819274064fba2cfa159ce94fe1862d0ae82969
parentb0937948acc28e39ac2ed53799dbc63bad8b2936
parent9ba4c1d15e6bcb20c47dff1067ab76e86d7c0f8a
Merge remote-tracking branch 'origin/master' into credentials