# HG changeset patch
# User casties
# Date 1333630561 -7200
# Node ID 1a20621f25551ca2193a1250adaea11cdd928919
# Parent  198b3ae3ea7e23e686ee64a0cef048472e242e3f# Parent  acdbd82114bbd523a7d58e3bcde81ae50aca0351
Merge with acdbd82114bbd523a7d58e3bcde81ae50aca0351

diff -r acdbd82114bb -r 1a20621f2555 __init__.py