# HG changeset patch
# User casties
# Date 1406130675 -7200
# Node ID 54d3498a6e785777f3a824b19595844fbb132997
# Parent  7aefbddddaf9a55cff808b4bedd0659204dd8a50# Parent  d6eca930a534108612c256edc0c56e6e9d0765c8
merge

diff -r 7aefbddddaf9 -r 54d3498a6e78 documentViewer.py