# HG changeset patch
# User Radek Brich <radek.brich@devl.cz>
# Date 1311151878 -7200
# Node ID 80634cb1c65b5c1baae100c1cef85b058b8a0ba0
# Parent  1fe6c30f7700b7005376b235ea64dbad472afc46# Parent  ddce8990b976c5d24e63d4e487f7ca9068da84ce
Merge.

diff -r 1fe6c30f7700 -r 80634cb1c65b .hgignore
diff -r 1fe6c30f7700 -r 80634cb1c65b pgtools/pgmanager.py