Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 2 Dec 2016 14:14:11 +0000 (15:14 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 2 Dec 2016 14:14:11 +0000 (15:14 +0100)
commit652e112e5f84ab8558235ee9ab02e663eae7678c
treefcdf26a047156c252f1097ed173b3ee1cc53dbfb
parent7b6f6c01a0395187b2b52fb703749c7e2d2ff03f
parentf88d55e43f3d3a4468c2faa0621044ad17594e5f
Merge remote-tracking branch 'origin/master' into credentials