cron 871c36f2f1 Merge branch 'master' of repo.or.cz:waspsaliva
Replicate the following commit (with cherry-picked parents on both
sides):

    commit 7652a30c72d89f158bbfbb1d80a1a16f462696e1
    Merge: 4a1b7bd37 096ce84ab
    Author:     cron <example@example.local>
    AuthorDate: Mon Oct 5 19:33:14 2020 +0000
    Commit:     cron <example@example.local>
    CommitDate: Mon Oct 5 19:33:14 2020 +0000

	Merge branch 'master' of repo.or.cz:waspsaliva
2021-08-28 22:25:07 -05:00
..
2021-08-28 22:22:02 -05:00
2021-08-28 22:23:42 -05:00
2020-08-24 19:49:42 +02:00
2020-08-15 16:00:26 +02:00
2021-08-28 22:12:31 -05:00