From: Nicolas Emiliani <nemiliani@integratech.com.ar>
Date: Sat, 10 Nov 2007 19:56:14 +0000 (-0300)
Subject: Merge baryon.com.ar:workspace/pymin
X-Git-Url: https://git.llucax.com/software/pymin.git/commitdiff_plain/6ed640af531e717da24d1dd423ce4f2df0fdec71?ds=sidebyside;hp=6ed640af531e717da24d1dd423ce4f2df0fdec71

Merge baryon.com.ar:workspace/pymin

Conflicts:

	config.py
---