# HG changeset patch
# User cathugger <cathugger@cock.li>
# Date 1567649912 0
# Node ID cff9a7daeaa228685312c981452f3366686bc600
# Parent  b894e50721f4d41d40b6f5313ebd42999e30aa1f# Parent  4291c23e1fba162df5670351153f8157084c9c63
Merge branch 'master' of git://hacking.allowed.ano/resdb