# HG changeset patch
# User Heiko Schlittermann (JUMPER) <hs@schlittermann.de>
# Date 1315603895 -7200
# Node ID 3c3305dcb038d7ca39e3ba03ba975b8f922e7f04
# Parent  00a538dd7908f1e85d9293f1e13fb863b059969e# Parent  e7938f859e2f2e34c79c44f8a8fb9ef546a01a0f
[merged]

diff -r 00a538dd7908 -r 3c3305dcb038 .hgsubstate