Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 4 Jan 2017 11:46:29 +0000 (12:46 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 4 Jan 2017 11:46:29 +0000 (12:46 +0100)
commit7122f35e2c00c29b1af31bdd294e93e6fcc84498
tree2d352c38d227d6c44d525efdbfd7324e4cec5015
parent3c1b722a8778b9f1f2b7564d3d2709f220e96547
parent60c6dfd1fe22a01a3f7723e7e2bb18d52895c527
Merge remote-tracking branch 'origin/master' into credentials