# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1324233093 -3600
# Node ID 1d0cbf9dd9032affe2b8bf904a9fe969374b4f5f
# Parent  e157bb40cc8cfa278bd099b6a1e9dd2395540a74# Parent  2d6bb0876770d810e7b1898f1d524b4240753ff7
Null merge of general changes introducing features already present on this branch.

diff -r e157bb40cc8c -r 1d0cbf9dd903 main.py
diff -r e157bb40cc8c -r 1d0cbf9dd903 ula.py