git » debian:dnss » commit 67590c5

Merge remote-tracking branch 'up/master' into upstream

author Alberto Bertogli
2017-08-10 20:44:56 UTC
committer Alberto Bertogli
2017-08-10 20:53:52 UTC
parent 19db75ba4f38dab877a915f0c5965a39d1d5cd96
parent 860d2af102d88604f73433d91d940f03c627178b
Merge remote-tracking branch 'up/master' into upstream

Import upstream changes to the repository.

Before we had snapshots, but here we change to a model where we track
upstream git (hence the merge of unrelated histories), for convenience.