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)
commita10ec0de46b8762f865887cbcd8aa9a966a1bb56
tree8aa3c5804b9827d33dbc74ee530cbd4b12f350dd
parent6d1ed68cab692c3d8b12f1091b93040c8e087f35
parent0b2367af12f9aaceafa68f90eac18be560956ecb
Mark branch 'upstream-experimental' as merged into upstream-stable,
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.