# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1536001713 -7200
# Node ID d54a4b9c1d01a48325d14b743eb59f01a11eadd1
# Parent  13d8a2d559bdf4e032c2dc09ac44294eb1aee202# Parent  eb9fa25091c78b6e5b3cc4913c7d0aeb4db69ee0
branching: merge the two stable heads

diff -r 13d8a2d559bd -r d54a4b9c1d01 hgext3rd/topic/__init__.py