# HG changeset patch
# User Daniel Neugebauer <dneuge@energiequant.de>
# Date 1459192973 -7200
# Node ID b4ad250ded0204f6fc0d2d27ca9203b15cd432be
# Parent  fa6d2de366ace56aa48663205c8715d15aff9570# Parent  bfe110645e2aad71cfdd1089fc851833129463a8
merge

diff -r bfe110645e2a -r b4ad250ded02 dev-vcs/kallithea/Manifest
diff -r bfe110645e2a -r b4ad250ded02 dev-vcs/kallithea/kallithea-0.3.1.ebuild