diff distinfo @ 16:05c6f16908de

MERGE: the latest head from branch "origin": keep the local copy
author Franz Glasner <hg@dom66.de>
date Sat, 11 Nov 2017 00:13:45 +0100
parents 748e69c58ee3
children 9b7ee2483282
line wrap: on
line diff