Mark branch 'upstream-experimental' as merged into upstream-stable,
authormirabilos <tg@debian.org>
Tue, 31 Jul 2018 15:44:43 +0000 (17:44 +0200)
committermirabilos <mirabilos@evolvis.org>
Tue, 31 Jul 2018 15:44:43 +0000 (17:44 +0200)
without need for grafts.

It turns out that the grafts are less stable in a bidirectional merge
like this, and this more matches the real proceeds of upstream anyway.


Trivial merge