Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 21 Nov 2016 19:47:10 +0000 (20:47 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 21 Nov 2016 19:47:10 +0000 (20:47 +0100)
commit3e22103e0cecfeb8a03e65733fd0ab5c475a302b
tree6594e0b08d8dc6da36c0b7f466e2243726c935c1
parentfad73f2435336733ae585c7a018df860bec3bdf1
parent0fa8cc7c2ec1d7d7d1a901a84b7740475f8b4648
Merge remote-tracking branch 'origin/master' into credentials